Merge "Move some classes to packages" into ub-launcher3-master