Pull request for: Introducing organizations

Please merge the organization entity into the main code.