Refactored models
Fixes for refactored  models;
Removed extra resources and repositories;
Refactored rest server
Particulary refactored model wrappers
Particulary refactored model wrappers