Reorganize per https://github.com/bling/dotemacs