Refactoring file structure