Cleanup client + server
Fix TileSet (just a rename)