Refactored controllers packages