Reorganization of the structure
More renaming