Continued to incorporate previously private classes and deep code
reorganization.