Clean up layout

More sanely ordered into folds like my Vim setup.