Organized file Controller Mostly Finished