Preparation for adding electrons

[johnomotani]

A lot of minor structural changes, being added now to reduce the number of conflicts when the electron branch (the latest is currently electrons-jto-debug) is added.