File cleanup, initial basecontroller commit