refactoring in files structure