Initial refactor commit.
More initial commit. Not sure why these show up as new files, not renamed... oh well.
Mods to make engine work.  Still WIP.