restructure cont.

Author His Dad <john@hisdad.org>
Author date 2015-04-20 01:37:05
Author local date 2015-04-20 13:37:05 +1200
Committer His Dad <john@hisdad.org>
Committer date 2015-04-20 01:37:05
Committer local date 2015-04-20 13:37:05 +1200
Commit 75f5a48dba02f87c8aae9d657736f8696b564551
Tree 038e58b4ade5e90c654fb740545582c43128a306
Parent 7c321b69b32df2f804414ce5e380a9108113b5ef
restructure cont.