Moved models to own module and added java and osgi client modules