Some minor file shuffling. Attempting to get angular routes to work still...