Reorganzied hierachie, added tiles and some minor changes