file structure refactor