Restructured a bit.  Removed duplicate classes that was causing compile
error.  Changed libraries (downloaded latest versions).  Updated classes
to reflect restructuring of files.