Refactored and renamed
Added client project