Huge refactoring nearing completion.  First version with no error markers on src tree.  Removed test tree from build path because of changes.