* Switched to quick (and less accurate) synonym fn.

* Cleaned up having way too many files
* Moved DB code to its own ns