more file structure refactoring