audit file structure refactoring