Fixed issues with the move to the main directory.  Removed temp and prototype developments from the source tree (but still tracked by repo).