Moved stuff around and cleaned up a bit. Added collective.monkeypatcher as well for monkeypatching