Tweaked API, cleaned up `./src`