Moved more things around, added some lovely interfaces for various resources.