Name the tilesets and give them constants.

Also clean up the tileset macro and remove placeholders/redundant files.