Merged some tiles and removed some unused empty directories