hierarchy fixes and took out unnecessary routes in app.js