--- a/src/Grids/Grids.jl	Fri Jan 21 15:23:08 2022 +0100
+++ b/src/Grids/Grids.jl	Sun Jan 12 21:18:44 2025 +0100
@@ -1,19 +1,52 @@
 module Grids
 
-using Sbplib.RegionIndices
+using Diffinitive.LazyTensors
+using StaticArrays
+using LinearAlgebra
 
-export BoundaryIdentifier, CartesianBoundary
+# Grid
+export Grid
+export coordinate_size
+export component_type
+export grid_id
+export boundary_id
+export boundary_indices
+export boundary_identifiers
+export boundary_grid
+export min_spacing
+export coarsen
+export refine
+export eval_on
+export componentview
+export ArrayComponentView
+export normal
 
-abstract type BoundaryIdentifier end
-struct CartesianBoundary{Dim, R<:Region} <: BoundaryIdentifier end
-dim(::CartesianBoundary{Dim, R}) where {Dim, R} = Dim
-region(::CartesianBoundary{Dim, R}) where {Dim, R} = R()
+export BoundaryIdentifier
+export TensorGridBoundary
+export CartesianBoundary
+export LowerBoundary
+export UpperBoundary
+
+export TensorGrid
+export ZeroDimGrid
+
+export EquidistantGrid
+export inverse_spacing
+export spacing
+export equidistant_grid
 
-export dim, region
 
-include("AbstractGrid.jl")
-include("EquidistantGrid.jl")
+# MappedGrid
+export MappedGrid
+export jacobian
+export logical_grid
+export mapped_grid
+export metric_tensor
 
-# TODO: Rename AbstractGrid to Grid and move definition here.
+include("grid.jl")
+include("tensor_grid.jl")
+include("equidistant_grid.jl")
+include("zero_dim_grid.jl")
+include("mapped_grid.jl")
 
 end # module