benjimaclellan · Jul 6, 2026 · Feb 6, 2026 · Feb 7, 2026 · Feb 27, 2026 · Feb 27, 2026
diff --git a/.gitignore b/.gitignore
@@ -188,4 +188,6 @@ site.zip
 
 ROADMAP.md
 CLAUDE.md
-.docs/
+.docs/
+
+.claude/
diff --git a/README.md b/README.md
@@ -50,9 +50,9 @@ source .venv/bin/activate
 
 ```python
 from squint.circuit import Circuit
-from squint.simulator.tn import Simulator
-from squint.ops.base import Wire
-from squint.ops.dv import DiscreteVariableState, HGate, RZGate
+from squint.backends.tensornetwork.simulator import Simulator
+from squint.interface.base import Wire
+from squint.interface.dv import DiscreteVariableState, HGate, RZGate
 from squint.utils import print_nonzero_entries, partition_op
 
 # let's implement a simple one-qubit circuit for phase estimation;
@@ -72,15 +72,15 @@ sim = Simulator.compile(static, params, optimize="greedy").jit()
 
 # Calculate metrics important to quantum metrology & sensing protocols
 # the quantum state and its gradient
-psi = sim.amplitudes.forward(params)      # |ψ(φ)⟩
-dpsi = sim.amplitudes.grad(params)        # ∂|ψ(φ)⟩/∂φ
+psi = sim.amplitudes.forward(params)  # |ψ(φ)⟩
+dpsi = sim.amplitudes.grad(params)  # ∂|ψ(φ)⟩/∂φ
 
 # Probabilities and their gradients
-p = sim.probabilities.forward(params)     # p(s|φ)
-dp = sim.probabilities.grad(params)       # ∂p(s|φ)/∂φ
+p = sim.probabilities.forward(params)  # p(s|φ)
+dp = sim.probabilities.grad(params)  # ∂p(s|φ)/∂φ
 
-qfi = sim.amplitudes.qfim(params)       # Quantum Fisher Information
-cfi = sim.probabilities.cfim(params)    # Classical Fisher Information
+qfi = sim.amplitudes.qfim(params)  # Quantum Fisher Information
+cfi = sim.probabilities.cfim(params)  # Classical Fisher Information
 ```
 
 

diff --git a/docs/api/base.md b/docs/api/base.md
@@ -1,45 +1,8 @@
-# Base Module
-
-The `squint.ops.base` module contains the core abstractions for building quantum circuits in Squint.
-
-## Key Concepts
-
-### Wires and Degrees of Freedom
-
-A **Wire** represents a quantum subsystem with a specific Hilbert space dimension. Each wire can optionally specify a degree of freedom (DoF) type to distinguish between different physical encodings:
-
-- **DV** - Discrete variable systems (qubits, qudits)
-- **CV** - Continuous variable systems (optical modes in Fock space)
-- **TimeBin**, **FreqBin**, **Spatial** - Photonic encoding schemes
-
-### Operation Hierarchy
-
-All quantum operations inherit from `AbstractOp`:
-
-- **States**: `AbstractPureState`, `AbstractMixedState` - Initial quantum states
-- **Gates**: `AbstractGate` - Unitary transformations
-- **Channels**: `AbstractKrausChannel`, `AbstractErasureChannel` - Non-unitary operations
-- **SharedGate** - Parameter sharing across multiple wires (e.g., for phase estimation)
-- **Block** - Grouping multiple operations
-
-### Typical Usage
-
-```python
-from squint.ops.base import Wire, DV, SharedGate
-
-# Create qubit wires
-q0 = Wire(dim=2, dof=DV, idx=0)
-q1 = Wire(dim=2, dof=DV, idx=1)
-
-# Use in operations
-from squint.ops.dv import DiscreteVariableState, RZGate
-state = DiscreteVariableState(wires=(q0,), n=(0,))
-phase = RZGate(wires=(q0,), phi=0.0)
-```
+# Base classes
 
 ---
 
 <!-- prettier-ignore -->
-::: squint.ops.base
+::: squint.interface.base
     options:
         heading_level: 3
diff --git a/docs/api/circuit.md b/docs/api/circuit.md
diff --git a/docs/api/distributed.md b/docs/api/distributed.md
diff --git a/docs/api/dv.md b/docs/api/dv.md
@@ -1,6 +1,6 @@
 # Discrete Variable
 
 <!-- prettier-ignore -->
-::: squint.ops.dv
+::: squint.interface.dv
     options:
         heading_level: 3
diff --git a/docs/api/fock.md b/docs/api/fock.md
@@ -1,6 +1,6 @@
 # Fock
 
 <!-- prettier-ignore -->
-::: squint.ops.fock
+::: squint.interface.fock
     options:
         heading_level: 3
diff --git a/docs/api/math.md b/docs/api/math.md
@@ -1,12 +1,6 @@
 # Math
 
 <!-- prettier-ignore -->
-::: squint.ops.math
-    options:
-        heading_level: 3
-
-
-<!-- prettier-ignore -->
-::: squint.ops.gellmann
+::: squint.math
     options:
         heading_level: 3
diff --git a/docs/api/noise.md b/docs/api/noise.md
@@ -1,6 +1,6 @@
 # Noise
 
 <!-- prettier-ignore -->
-::: squint.ops.noise
+::: squint.interface.noise
     options:
         heading_level: 3
diff --git a/docs/api/ops.md b/docs/api/ops.md
@@ -1,6 +1,6 @@
 # Quantum Operations
 
-This page documents all quantum operations available in Squint, organized by category.
+This page documents all quantum operations available in `squint`, organized by category.
 
 ---
 
@@ -16,7 +16,7 @@ Operations for continuous variable (CV) quantum systems using the Fock (photon n
 - `LinearOpticalUnitaryGate` - General passive linear optical transformation
 
 <!-- prettier-ignore -->
-::: squint.ops.fock
+::: squint.interface.fock
     options:
         heading_level: 3
 
@@ -34,7 +34,7 @@ Operations for finite-dimensional quantum systems including qubits (dim=2) and q
 - `CXGate`, `CZGate` - Controlled gates
 
 <!-- prettier-ignore -->
-::: squint.ops.dv
+::: squint.interface.dv
     options:
         heading_level: 3
 
@@ -52,7 +52,7 @@ Quantum noise channels for modeling decoherence and errors. These require the "m
 - `ErasureChannel` - Traces out (erases) specified wires
 
 <!-- prettier-ignore -->
-::: squint.ops.noise
+::: squint.interface.noise
     options:
         heading_level: 3
 

diff --git a/docs/api/simulator.md b/docs/api/simulator.md
@@ -1,6 +1,6 @@
-# Simulator
+# Backends and simulator
 
 <!-- prettier-ignore -->
-::: squint.simulator
+::: squint.backends
     options:
         heading_level: 3
diff --git a/docs/explanation/tricks_and_tips.md b/docs/explanation/tricks_and_tips.md
@@ -7,7 +7,7 @@ The `Circuit` class is the main interface for building quantum sensing protocols
 
 ```python
 from squint.circuit import Circuit
-from squint.simulator.tn import Simulator
+from squint.backends.tensornetwork.simulator import Simulator
 
 # Initialize circuit (backend auto-selected based on operations)
 circuit = Circuit()
@@ -27,12 +27,13 @@ The key methods are,
 ### Operations
 
 #### Discrete variable
+
 ```python
-from squint.ops.dv import *
+from squint.interface.dv import *
 
 # Pauli gates
 XGate(wires=(0,))
-YGate(wires=(0,))  
+YGate(wires=(0,))
 ZGate(wires=(0,))
 
 # Rotation gates
@@ -60,13 +61,14 @@ CPhaseGate(wires=(control, target), phi=angle)
 ```
 
 #### Fock/photon-number
+
 ```python
-from squint.ops.fock import *
+from squint.interface.fock import *
 
 FockState(wires=(0,), n=(0,))
 
 # Beam splitter
-BeamSplitter(wires=(0, 1), r=jnp.pi/4)
+BeamSplitter(wires=(0, 1), r=jnp.pi / 4)
 
 # Phase shift
 Phase(wires=(0,), phi=0.0)

diff --git a/docs/index.md b/docs/index.md
@@ -32,35 +32,35 @@
 
 ```python
 from squint.circuit import Circuit
-from squint.simulator.tn import Simulator
-from squint.ops.base import Wire
-from squint.ops.dv import DiscreteVariableState, HGate, RZGate
+from squint.backends.tensornetwork.simulator import Simulator
+from squint.interface.base import Wire
+from squint.interface.dv import DiscreteVariableState, HGate, RZGate
 from squint.utils import print_nonzero_entries, partition_op
 
 # Create a simple one-qubit phase estimation circuit
 # |0⟩ --- H --- Rz(φ) --- H --- |⟩
 wire = Wire(dim=2, idx=0)  # qubit with dim=2
 circuit = Circuit()
-circuit.add(DiscreteVariableState(wires=(wire,), n=(0,)))       # |0⟩ state
-circuit.add(HGate(wires=(wire,)))                               # Hadamard gate
-circuit.add(RZGate(wires=(wire,), phi=0.0 * jnp.pi), "phase")   # Phase rotation
-circuit.add(HGate(wires=(wire,)))                               # Second Hadamard
+circuit.add(DiscreteVariableState(wires=(wire,), n=(0,)))  # |0⟩ state
+circuit.add(HGate(wires=(wire,)))  # Hadamard gate
+circuit.add(RZGate(wires=(wire,), phi=0.0 * jnp.pi), "phase")  # Phase rotation
+circuit.add(HGate(wires=(wire,)))  # Second Hadamard
 
 # Compile the circuit for simulation
 params, static = partition_op(circuit, "phase")
 sim = Simulator.compile(static, params, optimize="greedy").jit()
 
 # Calculate metrics important to quantum metrology & sensing protocols
 # the quantum state and its gradient
-psi = sim.amplitudes.forward(params)      # |ψ(θ)⟩
-dpsi = sim.amplitudes.grad(params)        # ∂|ψ(θ)⟩/∂θ
+psi = sim.amplitudes.forward(params)  # |ψ(θ)⟩
+dpsi = sim.amplitudes.grad(params)  # ∂|ψ(θ)⟩/∂θ
 
 # Probabilities and their gradients
-p = sim.probabilities.forward(params)     # p(s|θ)
-dp = sim.probabilities.grad(params)       # ∂p(s|θ)/∂θ
+p = sim.probabilities.forward(params)  # p(s|θ)
+dp = sim.probabilities.grad(params)  # ∂p(s|θ)/∂θ
 
-qfi = sim.amplitudes.qfim(params)       # Quantum Fisher Information
-cfi = sim.probabilities.cfim(params)    # Classical Fisher Information
+qfi = sim.amplitudes.qfim(params)  # Quantum Fisher Information
+cfi = sim.probabilities.cfim(params)  # Classical Fisher Information
 ```
 
 ## Installation

diff --git a/docs/tutorials/multi_qubit.md b/docs/tutorials/multi_qubit.md
@@ -22,9 +22,9 @@ The phase accumulates as $N\varphi$, giving $N^2$ Fisher Information.
 ```python
 import jax.numpy as jnp
 from squint.circuit import Circuit
-from squint.simulator.tn import Simulator
-from squint.ops.base import Wire, SharedGate
-from squint.ops.dv import DiscreteVariableState, HGate, CXGate, RZGate
+from squint.backends.tensornetwork.simulator import Simulator
+from squint.interface.base import Wire, SharedGate
+from squint.interface.dv import DiscreteVariableState, HGate, CXGate, RZGate
 from squint.utils import partition_op
 
 N = 4

diff --git a/docs/tutorials/noise.md b/docs/tutorials/noise.md
@@ -28,10 +28,10 @@ $$\rho \to \mathcal{E}(\rho) = \sum_i K_i \rho K_i^\dagger$$
 ```python
 import jax.numpy as jnp
 from squint.circuit import Circuit
-from squint.simulator.tn import Simulator
-from squint.ops.base import Wire, SharedGate
-from squint.ops.dv import DiscreteVariableState, HGate, CXGate, RZGate
-from squint.ops.noise import DepolarizingChannel
+from squint.backends.tensornetwork.simulator import Simulator
+from squint.interface.base import Wire, SharedGate
+from squint.interface.dv import DiscreteVariableState, HGate, CXGate, RZGate
+from squint.interface.noise import DepolarizingChannel
 from squint.utils import partition_op
 
 N = 4
@@ -126,7 +126,7 @@ For small $N$, GHZ beats the SQL. For large $N$, noise accumulates and GHZ perfo
 ## Other Noise Channels
 
 ```python
-from squint.ops.noise import BitFlipChannel, PhaseFlipChannel, ErasureChannel
+from squint.interface.noise import BitFlipChannel, PhaseFlipChannel, ErasureChannel
 
 # Bit flip (random X errors)
 circuit.add(BitFlipChannel(wires=(wire,), p=0.1))

diff --git a/docs/tutorials/one_qubit.md b/docs/tutorials/one_qubit.md
@@ -19,9 +19,9 @@ We implement Ramsey interferometry: $|0\rangle \xrightarrow{H} \xrightarrow{R_z(
 ```python
 import jax.numpy as jnp
 from squint.circuit import Circuit
-from squint.simulator.tn import Simulator
-from squint.ops.base import Wire
-from squint.ops.dv import DiscreteVariableState, HGate, RZGate
+from squint.backends.tensornetwork.simulator import Simulator
+from squint.interface.base import Wire
+from squint.interface.dv import DiscreteVariableState, HGate, RZGate
 from squint.utils import partition_op
 ```