[#60333304]: Added base controllers
Refactored base controllers