Fixed all the messed up organization and added in the correct controllers and views.