Refactoring of modules in Home screen/AppLauncher.