Controller packaging refactoring