Renamed everything and removed routing