Some renaming (structure!!!)