Initial bit of organizing
Removal of old cruft and refactor of attr reader/accessors
Arrange exporting methods better