refactoring files structure