restructuring and refactoring