Code cleanup
- Moved interfaces and definitions into separate files so they can be moved into a submodule
- Cleaned up strings and functions that didn't get renamed properly during the renaming.