File structure refactor