Added static routes and moved some files around