Re-factored model objects classes to different package as well as changed some of the getters/setters to use the super class