almost done with the level reorganization