Uniformity

Merge uniformity to master. I've refactored a bunch of stuff including:

* The orphanage is now a storage layer, this is much cleaner than before.
* No delete feature. This is because the deletion is tight coupled with your application, so you have to implement this yourself.