refactoring file structure