Still broken, but getting there...
Pulled API into separate maven project
...
Working again... now just needs code review.