Adding Internal class for Relationship and Role Model. Updating the tests and the references in other classes