Merge "Refactoring folder content" into ub-launcher3-burnaby