Removed Groovy dependencies
Added Model and javadocs for the model as Guidelines