Removed the route class (will work on this later) and reorganized a few things