Base controllers restructure