Cleaned up the route controllers again. Put everything in index files under folders