Yes, it is a singleton. You can "unsingleton" it by using the fact that organizations are parties, are objects and therefore store a package_id with them. Then you "only" need to drop the unique constraint on the name of the organization and change the code to read and safe an organization to pass along the package_id.
