refactored several projects