Small file structure refactoring