Entity refinement

Refined the entity classes. No refactoring of field names, however some relations have been removed because they were redundant.

Changes in the "Tests" branch were continously merged into this branch to make sure changes would not interfere with other work, as these changes could be fatal.

All Tests OK. Manual endpoint-tests OK.