24557 - refactor

broke apart the controllers and did some reorganization