refactoring integration to project