Feeling moody and miserable for a variety of reasons so I'm channeling that into doing some much-needed backend reorganization and cleanup. If anything is broken, please bear with me!