New schema: Organization

with some tests