diff --git a/CLAUDE.md b/CLAUDE.md
index 634fe9b8..0c756e02 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -139,16 +139,43 @@ Atomizer/
 │   ├── operations/           # OP_01 - OP_07
 │   ├── system/              # SYS_10 - SYS_15
 │   └── extensions/          # EXT_01 - EXT_04
-├── optimization_engine/     # Core Python modules
-│   ├── extractors/          # Physics extraction library
+├── optimization_engine/     # Core Python modules (v2.0)
+│   ├── core/                # Optimization runners, method_selector, gradient_optimizer
+│   ├── nx/                  # NX/Nastran integration (solver, updater, session_manager)
+│   ├── study/               # Study management (creator, wizard, state, reset)
+│   ├── config/              # Configuration (manager, builder, setup_wizard)
+│   ├── reporting/           # Reports (visualizer, markdown_report, landscape_analyzer)
+│   ├── processors/          # Data processing
+│   │   └── surrogates/      # Neural network surrogates
+│   ├── extractors/          # Physics extraction library (unchanged)
 │   ├── gnn/                 # GNN surrogate module (Zernike)
-│   └── utils/               # Utilities (dashboard_db, trial_manager, study_archiver)
+│   ├── utils/               # Utilities (dashboard_db, trial_manager, study_archiver)
+│   └── validators/          # Validation (unchanged)
 ├── studies/                 # User studies
 ├── tools/                   # CLI tools (archive_study.bat, zernike_html_generator.py)
 ├── archive/                 # Deprecated code (for reference)
 └── atomizer-dashboard/      # React dashboard
 ```
 
+### Import Migration (v2.0)
+Old imports still work with deprecation warnings. New paths:
+```python
+# Core
+from optimization_engine.core.runner import OptimizationRunner
+from optimization_engine.core.intelligent_optimizer import IMSO
+from optimization_engine.core.gradient_optimizer import GradientOptimizer
+
+# NX Integration
+from optimization_engine.nx.solver import NXSolver
+from optimization_engine.nx.updater import NXParameterUpdater
+
+# Study Management
+from optimization_engine.study.creator import StudyCreator
+
+# Configuration
+from optimization_engine.config.manager import ConfigManager
+```
+
 ## GNN Surrogate for Zernike Optimization
 
 The `optimization_engine/gnn/` module provides Graph Neural Network surrogates for mirror optimization: