diff --git a/src/Aardvark.Base.Tensors/Aardvark.Base.Tensors.fsproj b/src/Aardvark.Base.Tensors/Aardvark.Base.Tensors.fsproj
index fd315fb8..263dd413 100644
--- a/src/Aardvark.Base.Tensors/Aardvark.Base.Tensors.fsproj
+++ b/src/Aardvark.Base.Tensors/Aardvark.Base.Tensors.fsproj
@@ -13,22 +13,22 @@
     <OutputPath>..\..\bin\Release</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="paket.references" />
-    <None Include="NativeTensorGenerator.fsx" />
-    <Compile Include="NativeTensorGenerated.fs" />
-    <Compile Include="NativeTensorExtensions.fs" />
-    <None Include="TensorUtilitiesGenerator.fsx" />
-    <Compile Include="TensorUtilitiesGenerated.fs" />
-    <Compile Include="TensorMath.fs" />
-    <Compile Include="PixImageErrorMetric.fs" />
-    <Compile Include="PixImageCube.fs" />
-    <Compile Include="ImageTrafo.fs" />
-    <Compile Include="Tensors.fs" />
+    <None Include="Native\NativeTensorGenerator.fsx" />
+    <Compile Include="Native\NativeTensorGenerated.fs" />
+    <Compile Include="Native\NativeTensorExtensions.fs" />
+    <None Include="Extensions\TensorUtilitiesGenerator.fsx" />
+    <Compile Include="Extensions\TensorUtilitiesGenerated.fs" />
+    <Compile Include="Extensions\TensorMath.fs" />
+    <Compile Include="Extensions\TensorSlicing.fs" />
+    <Compile Include="PixImage\PixImageErrorMetric.fs" />
+    <Compile Include="PixImage\PixImageCube.fs" />
+    <Compile Include="PixImage\ImageTrafo.fs" />
+    <Compile Include="PixImage\PixImageImageSharp.fs" />
     <Compile Include="Algorithms\QR.fs" />
     <Compile Include="Algorithms\SVD.fs" />
     <Compile Include="Algorithms\Solver.fs" />
     <None Include="Algorithms\Generator.fsx" />
-    <Compile Include="PixImageImageSharp.fs" />
+    <None Include="paket.references" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Aardvark.Base.FSharp\Aardvark.Base.FSharp.fsproj" />
diff --git a/src/Aardvark.Base.Tensors/TensorMath.fs b/src/Aardvark.Base.Tensors/Extensions/TensorMath.fs
similarity index 100%
rename from src/Aardvark.Base.Tensors/TensorMath.fs
rename to src/Aardvark.Base.Tensors/Extensions/TensorMath.fs
diff --git a/src/Aardvark.Base.Tensors/Tensors.fs b/src/Aardvark.Base.Tensors/Extensions/TensorSlicing.fs
similarity index 100%
rename from src/Aardvark.Base.Tensors/Tensors.fs
rename to src/Aardvark.Base.Tensors/Extensions/TensorSlicing.fs
diff --git a/src/Aardvark.Base.Tensors/TensorUtilitiesGenerated.fs b/src/Aardvark.Base.Tensors/Extensions/TensorUtilitiesGenerated.fs
similarity index 100%
rename from src/Aardvark.Base.Tensors/TensorUtilitiesGenerated.fs
rename to src/Aardvark.Base.Tensors/Extensions/TensorUtilitiesGenerated.fs
diff --git a/src/Aardvark.Base.Tensors/TensorUtilitiesGenerator.fsx b/src/Aardvark.Base.Tensors/Extensions/TensorUtilitiesGenerator.fsx
similarity index 100%
rename from src/Aardvark.Base.Tensors/TensorUtilitiesGenerator.fsx
rename to src/Aardvark.Base.Tensors/Extensions/TensorUtilitiesGenerator.fsx
diff --git a/src/Aardvark.Base.Tensors/NativeTensorExtensions.fs b/src/Aardvark.Base.Tensors/Native/NativeTensorExtensions.fs
similarity index 100%
rename from src/Aardvark.Base.Tensors/NativeTensorExtensions.fs
rename to src/Aardvark.Base.Tensors/Native/NativeTensorExtensions.fs
diff --git a/src/Aardvark.Base.Tensors/NativeTensorGenerated.fs b/src/Aardvark.Base.Tensors/Native/NativeTensorGenerated.fs
similarity index 100%
rename from src/Aardvark.Base.Tensors/NativeTensorGenerated.fs
rename to src/Aardvark.Base.Tensors/Native/NativeTensorGenerated.fs
diff --git a/src/Aardvark.Base.Tensors/NativeTensorGenerator.fsx b/src/Aardvark.Base.Tensors/Native/NativeTensorGenerator.fsx
similarity index 100%
rename from src/Aardvark.Base.Tensors/NativeTensorGenerator.fsx
rename to src/Aardvark.Base.Tensors/Native/NativeTensorGenerator.fsx
diff --git a/src/Aardvark.Base.Tensors/ImageTrafo.fs b/src/Aardvark.Base.Tensors/PixImage/ImageTrafo.fs
similarity index 100%
rename from src/Aardvark.Base.Tensors/ImageTrafo.fs
rename to src/Aardvark.Base.Tensors/PixImage/ImageTrafo.fs
diff --git a/src/Aardvark.Base.Tensors/PixImageCube.fs b/src/Aardvark.Base.Tensors/PixImage/PixImageCube.fs
similarity index 100%
rename from src/Aardvark.Base.Tensors/PixImageCube.fs
rename to src/Aardvark.Base.Tensors/PixImage/PixImageCube.fs
diff --git a/src/Aardvark.Base.Tensors/PixImageErrorMetric.fs b/src/Aardvark.Base.Tensors/PixImage/PixImageErrorMetric.fs
similarity index 100%
rename from src/Aardvark.Base.Tensors/PixImageErrorMetric.fs
rename to src/Aardvark.Base.Tensors/PixImage/PixImageErrorMetric.fs
diff --git a/src/Aardvark.Base.Tensors/PixImageImageSharp.fs b/src/Aardvark.Base.Tensors/PixImage/PixImageImageSharp.fs
similarity index 100%
rename from src/Aardvark.Base.Tensors/PixImageImageSharp.fs
rename to src/Aardvark.Base.Tensors/PixImage/PixImageImageSharp.fs