Clean up code layout for easier debugging
Merge branch 'master' of github.com:beingmeta/codex