--- a/src/LazyTensors/LazyTensors.jl	Mon Feb 21 10:33:58 2022 +0100
+++ b/src/LazyTensors/LazyTensors.jl	Fri Feb 03 22:14:47 2023 +0100
@@ -1,7 +1,39 @@
 module LazyTensors
+
 using Sbplib.RegionIndices
-include("tensor_mapping.jl")
+
+export TensorApplication
+export TensorTranspose
+export TensorComposition
+export IdentityTensor
+export ScalingTensor
+export DiagonalTensor
+export DenseTensor
+export InflatedTensor
+export LazyOuterProduct
+export ⊗
+export DomainSizeMismatch
+export RangeSizeMismatch
+
+include("lazy_tensor.jl")
+include("tensor_types.jl")
 include("lazy_array.jl")
 include("lazy_tensor_operations.jl")
+include("tuple_manipulation.jl")
+
+# Applying lazy tensors to vectors
+Base.:*(a::LazyTensor, v::AbstractArray) = TensorApplication(a,v)
+Base.:*(a::LazyTensor, b::LazyTensor) = throw(MethodError(Base.:*,(a,b)))
+Base.:*(a::LazyTensor, args::Union{LazyTensor, AbstractArray}...) = foldr(*,(a,args...))
+
+# Addition and subtraction of lazy tensors
+Base.:+(s::LazyTensor, t::LazyTensor) = ElementwiseTensorOperation{:+}(s,t)
+Base.:-(s::LazyTensor, t::LazyTensor) = ElementwiseTensorOperation{:-}(s,t)
+
+# Composing lazy tensors
+Base.:∘(s::LazyTensor, t::LazyTensor) = TensorComposition(s,t)
+
+# Outer products of tensors
+⊗(a::LazyTensor, b::LazyTensor) = LazyOuterProduct(a,b)
 
 end # module