a bit of reorg, still playing with org mode formatting on github