Moved controllers around, cleaned up js and css imports