finish refactoring the files structure