Reorganization and changes for 1.7