Added routes, re-ordered js files