Clean up code organization

[phdavis1027]

This is mostly in reference to the root lib.rs file, which currently has a dump of different unrelated types that should probably go somewhere else, in smaller and more maintainable files.