More modularization

Turned more things into modules, started using them more to remove
duplicate code
Cleanup

Deleted some files that served no purpose and didn't have much code in
them