Continuing to work on the reorganization and doc.