Deleted unused files; renamed some classes

Fixed linkage and names on side bar, controllers are still pretty whack