File structure refactoring.