Add routes and separate modules