Reorganize a few things in init.el

We'll see how they work out. I think they're mostly an improvement.