Reorganizing a bit, org mode goodies