structural refactoring & renaming