Cleaned up module dependencies
Created better route folder system. This will allow for namespacing