Moved classes to schemas
Finished Organization Schema