Random update

Removed some old classes, added tile indexing