refactoring all project