Changes to the overall structure.  Will not currently build.