Initial reformatting performed by jdonovan, and some restructuring rewriting being committed from Eric Hu's work
Oversized commit of substantial changes :(
Overssized commit of substantial changes :(
Committing untracked files from Eric Hu's distribution