Added second organization file, tweaked schema.