Updated organization name
Added entities representing the objects required to implement the security model (not full test coverage)