substantial reorganization of directories and improvements to build process