refactoring structure
refactoring structure