Removed iPOJO dependency
Added the Model bundle
Refactored project and module setup