file structure refactorings