Repository cleanup

Working on cleaning up the repo.  More to come.

- [ ] Do the "more" parts