Tile Refactor - Phase III - Blocks

Just a few tweaks based on Tile Refactor Phase III in Core. Most things
are cleaned up now and moved.