Updated schema, added PSR-4.