refactoring the structure.