Refactored and renamed project for new direction