Further reorganization and minor changes