Refactoring layouts for package