refactoring most files to change the project