Rename objects folders, and addition of the level 2 objects