Removed trash files and slightly reconfigured routing