Reorganization and some renaming