Disorderly

Removes orderly as a dependency and all the refactoring that comes with it.