Changed to flat class structure.  Updated documentation.