File structure refactored