massive restructuring to remove the framework complexity.  Also massively simplified the build in order to get the functional tests running