Refactoring all project