file structure refactoring