Changed build and separate API jar (prepare to move this to another Project later !!!