refactored clxx project a little