diff --git a/fftTiffImg/main.cpp b/fftTiffImg/main.cpp
index 26480f0..8493ecd 100644
--- a/fftTiffImg/main.cpp
+++ b/fftTiffImg/main.cpp
@@ -14,27 +14,27 @@
  * License along with libLiFFT.  If not, see <www.gnu.org/licenses/>.
  */
  
-#include <iostream>
-#include <string>
-#include <boost/program_options.hpp>
 #include "tiffWriter/image.hpp"
 #include "tiffWriter/traitsAndPolicies.hpp"
-#include "libLiFFT/FFT.hpp"
+#include "liFFT/FFT.hpp"
 #if defined(WITH_CUDA)
-#   include "libLiFFT/libraries/cuFFT/cuFFT.hpp"
+#   include "liFFT/libraries/cuFFT/cuFFT.hpp"
     using FFT_LIB = LiFFT::libraries::cuFFT::CuFFT<>;
 #else
-#   include "libLiFFT/libraries/fftw/FFTW.hpp"
+#   include "liFFT/libraries/fftw/FFTW.hpp"
     using FFT_LIB = LiFFT::libraries::fftw::FFTW<>;
 #endif
-#include "libLiFFT/policies/Copy.hpp"
-#include "libLiFFT/types/SymmetricWrapper.hpp"
-#include "libLiFFT/accessors/TransformAccessor.hpp"
-#include "libLiFFT/accessors/TransposeAccessor.hpp"
-#include "libLiFFT/policies/CalcIntensityFunctor.hpp"
-#include "libLiFFT/types/View.hpp"
-#include "libLiFFT/types/SliceView.hpp"
+#include "liFFT/policies/Copy.hpp"
+#include "liFFT/types/SymmetricWrapper.hpp"
+#include "liFFT/accessors/TransformAccessor.hpp"
+#include "liFFT/accessors/TransposeAccessor.hpp"
+#include "liFFT/policies/CalcIntensityFunctor.hpp"
+#include "liFFT/types/View.hpp"
+#include "liFFT/types/SliceView.hpp"
+#include <boost/program_options.hpp>
 #include <chrono>
+#include <iostream>
+#include <string>
 
 namespace po = boost::program_options;
 using std::string;
diff --git a/include/libLiFFT/AutoDetect.hpp b/include/liFFT/AutoDetect.hpp
similarity index 100%
rename from include/libLiFFT/AutoDetect.hpp
rename to include/liFFT/AutoDetect.hpp
diff --git a/include/libLiFFT/Composite.hpp b/include/liFFT/Composite.hpp
similarity index 100%
rename from include/libLiFFT/Composite.hpp
rename to include/liFFT/Composite.hpp
diff --git a/include/libLiFFT/FFT.hpp b/include/liFFT/FFT.hpp
similarity index 97%
rename from include/libLiFFT/FFT.hpp
rename to include/liFFT/FFT.hpp
index 373f5c0..ef6d24d 100644
--- a/include/libLiFFT/FFT.hpp
+++ b/include/liFFT/FFT.hpp
@@ -16,11 +16,11 @@
  
 #pragma once
 
-#include "libLiFFT/FFT_Properties.hpp"
+#include "liFFT/FFT_Properties.hpp"
 
 // Included for convenience, so only one include is required from user code
-#include "libLiFFT/FFT_Definition.hpp"
-#include "libLiFFT/FFT_DataWrapper.hpp"
+#include "liFFT/FFT_Definition.hpp"
+#include "liFFT/FFT_DataWrapper.hpp"
 #include <boost/mpl/apply.hpp>
 
 namespace bmpl = boost::mpl;
diff --git a/include/libLiFFT/FFT_DataWrapper.hpp b/include/liFFT/FFT_DataWrapper.hpp
similarity index 95%
rename from include/libLiFFT/FFT_DataWrapper.hpp
rename to include/liFFT/FFT_DataWrapper.hpp
index ac8a676..d4c6afc 100644
--- a/include/libLiFFT/FFT_DataWrapper.hpp
+++ b/include/liFFT/FFT_DataWrapper.hpp
@@ -16,22 +16,22 @@
  
 #pragma once
 
-#include "libLiFFT/AutoDetect.hpp"
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/traits/IsComplex.hpp"
-#include "libLiFFT/traits/IsAoS.hpp"
-#include "libLiFFT/traits/IsStrided.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
-#include "libLiFFT/policies/GetStrides.hpp"
-#include "libLiFFT/mem/RealValues.hpp"
-#include "libLiFFT/mem/ComplexAoSValues.hpp"
-#include "libLiFFT/mem/ComplexSoAValues.hpp"
-#include "libLiFFT/mem/DataContainer.hpp"
-#include "libLiFFT/traits/IdentityAccessor.hpp"
-#include "libLiFFT/traits/IsDeviceMemory.hpp"
-#include "libLiFFT/types/SymmetricWrapper.hpp"
-#include "libLiFFT/c++14_types.hpp"
-#include "libLiFFT/FFT_Memory.hpp"
+#include "liFFT/AutoDetect.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/traits/IsComplex.hpp"
+#include "liFFT/traits/IsAoS.hpp"
+#include "liFFT/traits/IsStrided.hpp"
+#include "liFFT/policies/GetExtents.hpp"
+#include "liFFT/policies/GetStrides.hpp"
+#include "liFFT/mem/RealValues.hpp"
+#include "liFFT/mem/ComplexAoSValues.hpp"
+#include "liFFT/mem/ComplexSoAValues.hpp"
+#include "liFFT/mem/DataContainer.hpp"
+#include "liFFT/traits/IdentityAccessor.hpp"
+#include "liFFT/traits/IsDeviceMemory.hpp"
+#include "liFFT/types/SymmetricWrapper.hpp"
+#include "liFFT/c++14_types.hpp"
+#include "liFFT/FFT_Memory.hpp"
 #include <type_traits>
 #include <functional>
 
diff --git a/include/libLiFFT/FFT_Definition.hpp b/include/liFFT/FFT_Definition.hpp
similarity index 97%
rename from include/libLiFFT/FFT_Definition.hpp
rename to include/liFFT/FFT_Definition.hpp
index 8a893fd..6d01518 100644
--- a/include/libLiFFT/FFT_Definition.hpp
+++ b/include/liFFT/FFT_Definition.hpp
@@ -16,16 +16,16 @@
  
 #pragma once
 
-#include "libLiFFT/FFT_Kind.hpp"
-#include "libLiFFT/AutoDetect.hpp"
-#include "libLiFFT/c++14_types.hpp"
-#include "libLiFFT/util.hpp"
-#include "libLiFFT/FFT_DataWrapper.hpp"
-#include "libLiFFT/FFT_InplaceOutput.hpp"
-#include "libLiFFT/types/View.hpp"
-#include "libLiFFT/mem/DataContainer.hpp"
-#include "libLiFFT/mem/RealValues.hpp"
-#include "libLiFFT/mem/ComplexAoSValues.hpp"
+#include "liFFT/FFT_Kind.hpp"
+#include "liFFT/AutoDetect.hpp"
+#include "liFFT/c++14_types.hpp"
+#include "liFFT/util.hpp"
+#include "liFFT/FFT_DataWrapper.hpp"
+#include "liFFT/FFT_InplaceOutput.hpp"
+#include "liFFT/types/View.hpp"
+#include "liFFT/mem/DataContainer.hpp"
+#include "liFFT/mem/RealValues.hpp"
+#include "liFFT/mem/ComplexAoSValues.hpp"
 
 namespace LiFFT {
 
diff --git a/include/libLiFFT/FFT_InplaceOutput.hpp b/include/liFFT/FFT_InplaceOutput.hpp
similarity index 94%
rename from include/libLiFFT/FFT_InplaceOutput.hpp
rename to include/liFFT/FFT_InplaceOutput.hpp
index 2327caa..9c98388 100644
--- a/include/libLiFFT/FFT_InplaceOutput.hpp
+++ b/include/liFFT/FFT_InplaceOutput.hpp
@@ -16,13 +16,13 @@
  
 #pragma once
 
-#include "libLiFFT/accessors/ArrayAccessor.hpp"
-#include "libLiFFT/FFT_DataWrapper.hpp"
-#include "libLiFFT/c++14_types.hpp"
-#include "libLiFFT/traits/IdentityAccessor.hpp"
-#include "libLiFFT/types/Real.hpp"
-#include "libLiFFT/types/Complex.hpp"
-#include "libLiFFT/mem/PlainPtrWrapper.hpp"
+#include "liFFT/accessors/ArrayAccessor.hpp"
+#include "liFFT/FFT_DataWrapper.hpp"
+#include "liFFT/c++14_types.hpp"
+#include "liFFT/traits/IdentityAccessor.hpp"
+#include "liFFT/types/Real.hpp"
+#include "liFFT/types/Complex.hpp"
+#include "liFFT/mem/PlainPtrWrapper.hpp"
 #include <stdexcept>
 
 namespace LiFFT {
diff --git a/include/libLiFFT/FFT_Kind.hpp b/include/liFFT/FFT_Kind.hpp
similarity index 100%
rename from include/libLiFFT/FFT_Kind.hpp
rename to include/liFFT/FFT_Kind.hpp
diff --git a/include/libLiFFT/FFT_Memory.hpp b/include/liFFT/FFT_Memory.hpp
similarity index 97%
rename from include/libLiFFT/FFT_Memory.hpp
rename to include/liFFT/FFT_Memory.hpp
index 02a9bc9..e9add69 100644
--- a/include/libLiFFT/FFT_Memory.hpp
+++ b/include/liFFT/FFT_Memory.hpp
@@ -16,12 +16,12 @@
  
 #pragma once
 
-#include "libLiFFT/policies/Copy.hpp"
-#include "libLiFFT/policies/SafePtrCast.hpp"
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/traits/GetMemSize.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
-#include "libLiFFT/accessors/ConvertAccessor.hpp"
+#include "liFFT/policies/Copy.hpp"
+#include "liFFT/policies/SafePtrCast.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/traits/GetMemSize.hpp"
+#include "liFFT/policies/GetExtents.hpp"
+#include "liFFT/accessors/ConvertAccessor.hpp"
 #include <algorithm>
 
 namespace LiFFT {
diff --git a/include/libLiFFT/FFT_Properties.hpp b/include/liFFT/FFT_Properties.hpp
similarity index 98%
rename from include/libLiFFT/FFT_Properties.hpp
rename to include/liFFT/FFT_Properties.hpp
index fc4f75c..905e949 100644
--- a/include/libLiFFT/FFT_Properties.hpp
+++ b/include/liFFT/FFT_Properties.hpp
@@ -16,7 +16,7 @@
  
 #pragma once
 
-#include "libLiFFT/FFT_Kind.hpp"
+#include "liFFT/FFT_Kind.hpp"
 
 namespace LiFFT {
 namespace detail {
diff --git a/include/libLiFFT/accessors/ArrayAccessor.hpp b/include/liFFT/accessors/ArrayAccessor.hpp
similarity index 100%
rename from include/libLiFFT/accessors/ArrayAccessor.hpp
rename to include/liFFT/accessors/ArrayAccessor.hpp
diff --git a/include/libLiFFT/accessors/ConvertAccessor.hpp b/include/liFFT/accessors/ConvertAccessor.hpp
similarity index 97%
rename from include/libLiFFT/accessors/ConvertAccessor.hpp
rename to include/liFFT/accessors/ConvertAccessor.hpp
index acb63d5..e947f7a 100644
--- a/include/libLiFFT/accessors/ConvertAccessor.hpp
+++ b/include/liFFT/accessors/ConvertAccessor.hpp
@@ -16,8 +16,8 @@
  
 #pragma once
 
-#include "libLiFFT/util.hpp"
-#include "libLiFFT/c++14_types.hpp"
+#include "liFFT/util.hpp"
+#include "liFFT/c++14_types.hpp"
 
 namespace LiFFT {
 namespace accessors {
diff --git a/include/libLiFFT/accessors/DataContainerAccessor.hpp b/include/liFFT/accessors/DataContainerAccessor.hpp
similarity index 96%
rename from include/libLiFFT/accessors/DataContainerAccessor.hpp
rename to include/liFFT/accessors/DataContainerAccessor.hpp
index 47ee003..99f9b17 100644
--- a/include/libLiFFT/accessors/DataContainerAccessor.hpp
+++ b/include/liFFT/accessors/DataContainerAccessor.hpp
@@ -16,9 +16,9 @@
  
 #pragma once
 
-#include <libLiFFT/policies/flattenIdx.hpp>
-#include "libLiFFT/c++14_types.hpp"
-#include "libLiFFT/util.hpp"
+#include "liFFT/policies/flattenIdx.hpp"
+#include "liFFT/c++14_types.hpp"
+#include "liFFT/util.hpp"
 
 namespace LiFFT {
 namespace accessors {
diff --git a/include/libLiFFT/accessors/ImageAccessor.hpp b/include/liFFT/accessors/ImageAccessor.hpp
similarity index 97%
rename from include/libLiFFT/accessors/ImageAccessor.hpp
rename to include/liFFT/accessors/ImageAccessor.hpp
index 5a5f413..a6eb463 100644
--- a/include/libLiFFT/accessors/ImageAccessor.hpp
+++ b/include/liFFT/accessors/ImageAccessor.hpp
@@ -17,8 +17,8 @@
 #pragma once
 
 #include <functional>
-#include "libLiFFT/types/Vec.hpp"
-#include "libLiFFT/Composite.hpp"
+#include "liFFT/types/Vec.hpp"
+#include "liFFT/Composite.hpp"
 
 namespace LiFFT {
 namespace accessors {
diff --git a/include/libLiFFT/accessors/StreamAccessor.hpp b/include/liFFT/accessors/StreamAccessor.hpp
similarity index 100%
rename from include/libLiFFT/accessors/StreamAccessor.hpp
rename to include/liFFT/accessors/StreamAccessor.hpp
diff --git a/include/libLiFFT/accessors/TransformAccessor.hpp b/include/liFFT/accessors/TransformAccessor.hpp
similarity index 100%
rename from include/libLiFFT/accessors/TransformAccessor.hpp
rename to include/liFFT/accessors/TransformAccessor.hpp
diff --git a/include/libLiFFT/accessors/TransposeAccessor.hpp b/include/liFFT/accessors/TransposeAccessor.hpp
similarity index 98%
rename from include/libLiFFT/accessors/TransposeAccessor.hpp
rename to include/liFFT/accessors/TransposeAccessor.hpp
index 5b3eea4..6cf704c 100644
--- a/include/libLiFFT/accessors/TransposeAccessor.hpp
+++ b/include/liFFT/accessors/TransposeAccessor.hpp
@@ -16,7 +16,7 @@
  
 #pragma once
 
-#include "libLiFFT/accessors/ArrayAccessor.hpp"
+#include "liFFT/accessors/ArrayAccessor.hpp"
 
 namespace LiFFT {
 namespace accessors {
diff --git a/include/libLiFFT/accessors/VolumeAccessor.hpp b/include/liFFT/accessors/VolumeAccessor.hpp
similarity index 98%
rename from include/libLiFFT/accessors/VolumeAccessor.hpp
rename to include/liFFT/accessors/VolumeAccessor.hpp
index 8cb8c30..8d7aca8 100644
--- a/include/libLiFFT/accessors/VolumeAccessor.hpp
+++ b/include/liFFT/accessors/VolumeAccessor.hpp
@@ -16,7 +16,7 @@
  
 #pragma once
 
-#include "libLiFFT/c++14_types.hpp"
+#include "liFFT/c++14_types.hpp"
 
 namespace LiFFT {
 namespace accessors {
diff --git a/include/libLiFFT/accessors/ZipAccessor.hpp b/include/liFFT/accessors/ZipAccessor.hpp
similarity index 98%
rename from include/libLiFFT/accessors/ZipAccessor.hpp
rename to include/liFFT/accessors/ZipAccessor.hpp
index 1fd514b..f1e7786 100644
--- a/include/libLiFFT/accessors/ZipAccessor.hpp
+++ b/include/liFFT/accessors/ZipAccessor.hpp
@@ -16,7 +16,7 @@
  
 #pragma once
 
-#include "libLiFFT/traits/IdentityAccessor.hpp"
+#include "liFFT/traits/IdentityAccessor.hpp"
 
 namespace LiFFT {
 namespace accessors {
diff --git a/include/libLiFFT/c++14_types.hpp b/include/liFFT/c++14_types.hpp
similarity index 100%
rename from include/libLiFFT/c++14_types.hpp
rename to include/liFFT/c++14_types.hpp
diff --git a/include/libLiFFT/generateData.hpp b/include/liFFT/generateData.hpp
similarity index 95%
rename from include/libLiFFT/generateData.hpp
rename to include/liFFT/generateData.hpp
index 8c6c85a..827d3ac 100644
--- a/include/libLiFFT/generateData.hpp
+++ b/include/liFFT/generateData.hpp
@@ -16,11 +16,11 @@
  
 #pragma once
 
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/traits/IdentityAccessor.hpp"
-#include "libLiFFT/policies/Copy.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
-#include "libLiFFT/mem/DataContainer.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/traits/IdentityAccessor.hpp"
+#include "liFFT/policies/Copy.hpp"
+#include "liFFT/policies/GetExtents.hpp"
+#include "liFFT/mem/DataContainer.hpp"
 
 namespace LiFFT {
 
diff --git a/include/libLiFFT/ignore_unused.hpp b/include/liFFT/ignore_unused.hpp
similarity index 100%
rename from include/libLiFFT/ignore_unused.hpp
rename to include/liFFT/ignore_unused.hpp
diff --git a/include/libLiFFT/libLiFFT.hpp b/include/liFFT/libLiFFT.hpp
similarity index 100%
rename from include/libLiFFT/libLiFFT.hpp
rename to include/liFFT/libLiFFT.hpp
diff --git a/include/libLiFFT/libraries/cuFFT/Plan.hpp b/include/liFFT/libraries/cuFFT/Plan.hpp
similarity index 100%
rename from include/libLiFFT/libraries/cuFFT/Plan.hpp
rename to include/liFFT/libraries/cuFFT/Plan.hpp
diff --git a/include/libLiFFT/libraries/cuFFT/cuFFT.hpp b/include/liFFT/libraries/cuFFT/cuFFT.hpp
similarity index 94%
rename from include/libLiFFT/libraries/cuFFT/cuFFT.hpp
rename to include/liFFT/libraries/cuFFT/cuFFT.hpp
index 5a5eee4..979ad74 100644
--- a/include/libLiFFT/libraries/cuFFT/cuFFT.hpp
+++ b/include/liFFT/libraries/cuFFT/cuFFT.hpp
@@ -16,10 +16,10 @@
  
 #pragma once
 
-#include "libLiFFT/libraries/cuFFT/policies/CudaAllocator.hpp"
-#include "libLiFFT/libraries/cuFFT/policies/CudaMemCpy.hpp"
-#include "libLiFFT/libraries/cuFFT/policies/Planner.hpp"
-#include "libLiFFT/libraries/cuFFT/policies/ExecutePlan.hpp"
+#include "liFFT/libraries/cuFFT/policies/CudaAllocator.hpp"
+#include "liFFT/libraries/cuFFT/policies/CudaMemCpy.hpp"
+#include "liFFT/libraries/cuFFT/policies/Planner.hpp"
+#include "liFFT/libraries/cuFFT/policies/ExecutePlan.hpp"
 #include <boost/mpl/placeholders.hpp>
 
 namespace bmpl = boost::mpl;
diff --git a/include/libLiFFT/libraries/cuFFT/cudaSafeCall.hpp b/include/liFFT/libraries/cuFFT/cudaSafeCall.hpp
similarity index 100%
rename from include/libLiFFT/libraries/cuFFT/cudaSafeCall.hpp
rename to include/liFFT/libraries/cuFFT/cudaSafeCall.hpp
diff --git a/include/libLiFFT/libraries/cuFFT/policies/CudaAllocator.hpp b/include/liFFT/libraries/cuFFT/policies/CudaAllocator.hpp
similarity index 96%
rename from include/libLiFFT/libraries/cuFFT/policies/CudaAllocator.hpp
rename to include/liFFT/libraries/cuFFT/policies/CudaAllocator.hpp
index 894aa8b..16c5e7b 100644
--- a/include/libLiFFT/libraries/cuFFT/policies/CudaAllocator.hpp
+++ b/include/liFFT/libraries/cuFFT/policies/CudaAllocator.hpp
@@ -18,7 +18,7 @@
 
 #include <cuda.h>
 #include <cuda_runtime_api.h>
-#include "libLiFFT/libraries/cuFFT/cudaSafeCall.hpp"
+#include "liFFT/libraries/cuFFT/cudaSafeCall.hpp"
 
 namespace LiFFT {
 namespace libraries {
diff --git a/include/libLiFFT/libraries/cuFFT/policies/CudaMemCpy.hpp b/include/liFFT/libraries/cuFFT/policies/CudaMemCpy.hpp
similarity index 97%
rename from include/libLiFFT/libraries/cuFFT/policies/CudaMemCpy.hpp
rename to include/liFFT/libraries/cuFFT/policies/CudaMemCpy.hpp
index c57f228..d0609e2 100644
--- a/include/libLiFFT/libraries/cuFFT/policies/CudaMemCpy.hpp
+++ b/include/liFFT/libraries/cuFFT/policies/CudaMemCpy.hpp
@@ -18,7 +18,7 @@
 
 #include <cuda.h>
 #include <cuda_runtime_api.h>
-#include "libLiFFT/libraries/cuFFT/cudaSafeCall.hpp"
+#include "liFFT/libraries/cuFFT/cudaSafeCall.hpp"
 
 namespace LiFFT {
 namespace libraries {
diff --git a/include/libLiFFT/libraries/cuFFT/policies/ExecutePlan.hpp b/include/liFFT/libraries/cuFFT/policies/ExecutePlan.hpp
similarity index 95%
rename from include/libLiFFT/libraries/cuFFT/policies/ExecutePlan.hpp
rename to include/liFFT/libraries/cuFFT/policies/ExecutePlan.hpp
index 7b8af80..9ca2bab 100644
--- a/include/libLiFFT/libraries/cuFFT/policies/ExecutePlan.hpp
+++ b/include/liFFT/libraries/cuFFT/policies/ExecutePlan.hpp
@@ -20,13 +20,13 @@
 #include <type_traits>
 #include <cufft.h>
 #include <string>
-#include "libLiFFT/types/TypePair.hpp"
-#include "libLiFFT/libraries/cuFFT/Plan.hpp"
-#include "libLiFFT/libraries/cuFFT/traits/FFTType.hpp"
-#include "libLiFFT/libraries/cuFFT/traits/Sign.hpp"
-#include "libLiFFT/libraries/cuFFT/traits/LibTypes.hpp"
-#include "libLiFFT/policies/SafePtrCast.hpp"
-#include "libLiFFT/libraries/cuFFT/policies/GetInplaceMemSize.hpp"
+#include "liFFT/types/TypePair.hpp"
+#include "liFFT/libraries/cuFFT/Plan.hpp"
+#include "liFFT/libraries/cuFFT/traits/FFTType.hpp"
+#include "liFFT/libraries/cuFFT/traits/Sign.hpp"
+#include "liFFT/libraries/cuFFT/traits/LibTypes.hpp"
+#include "liFFT/policies/SafePtrCast.hpp"
+#include "liFFT/libraries/cuFFT/policies/GetInplaceMemSize.hpp"
 
 namespace LiFFT {
 namespace libraries {
diff --git a/include/libLiFFT/libraries/cuFFT/policies/GetInplaceMemSize.hpp b/include/liFFT/libraries/cuFFT/policies/GetInplaceMemSize.hpp
similarity index 95%
rename from include/libLiFFT/libraries/cuFFT/policies/GetInplaceMemSize.hpp
rename to include/liFFT/libraries/cuFFT/policies/GetInplaceMemSize.hpp
index f300596..4320e3b 100644
--- a/include/libLiFFT/libraries/cuFFT/policies/GetInplaceMemSize.hpp
+++ b/include/liFFT/libraries/cuFFT/policies/GetInplaceMemSize.hpp
@@ -16,8 +16,8 @@
  
 #pragma once
 
-#include "libLiFFT/libraries/cuFFT/traits/LibTypes.hpp"
-#include "libLiFFT/policies/GetNumElements.hpp"
+#include "liFFT/libraries/cuFFT/traits/LibTypes.hpp"
+#include "liFFT/policies/GetNumElements.hpp"
 
 namespace LiFFT {
 namespace libraries {
diff --git a/include/libLiFFT/libraries/cuFFT/policies/Planner.hpp b/include/liFFT/libraries/cuFFT/policies/Planner.hpp
similarity index 95%
rename from include/libLiFFT/libraries/cuFFT/policies/Planner.hpp
rename to include/liFFT/libraries/cuFFT/policies/Planner.hpp
index cc103d1..c06d336 100644
--- a/include/libLiFFT/libraries/cuFFT/policies/Planner.hpp
+++ b/include/liFFT/libraries/cuFFT/policies/Planner.hpp
@@ -17,12 +17,12 @@
 #pragma once
 
 #include <cufft.h>
-#include "libLiFFT/types/TypePair.hpp"
-#include "libLiFFT/libraries/cuFFT/Plan.hpp"
-#include "libLiFFT/libraries/cuFFT/traits/FFTType.hpp"
-#include "libLiFFT/libraries/cuFFT/traits/Sign.hpp"
-#include "libLiFFT/libraries/cuFFT/traits/LibTypes.hpp"
-#include "libLiFFT/libraries/cuFFT/policies/GetInplaceMemSize.hpp"
+#include "liFFT/types/TypePair.hpp"
+#include "liFFT/libraries/cuFFT/Plan.hpp"
+#include "liFFT/libraries/cuFFT/traits/FFTType.hpp"
+#include "liFFT/libraries/cuFFT/traits/Sign.hpp"
+#include "liFFT/libraries/cuFFT/traits/LibTypes.hpp"
+#include "liFFT/libraries/cuFFT/policies/GetInplaceMemSize.hpp"
 #include <cassert>
 #include <limits>
 
diff --git a/include/libLiFFT/libraries/cuFFT/traits/FFTType.hpp b/include/liFFT/libraries/cuFFT/traits/FFTType.hpp
similarity index 100%
rename from include/libLiFFT/libraries/cuFFT/traits/FFTType.hpp
rename to include/liFFT/libraries/cuFFT/traits/FFTType.hpp
diff --git a/include/libLiFFT/libraries/cuFFT/traits/LibTypes.hpp b/include/liFFT/libraries/cuFFT/traits/LibTypes.hpp
similarity index 95%
rename from include/libLiFFT/libraries/cuFFT/traits/LibTypes.hpp
rename to include/liFFT/libraries/cuFFT/traits/LibTypes.hpp
index 574bd20..2d6b5b8 100644
--- a/include/libLiFFT/libraries/cuFFT/traits/LibTypes.hpp
+++ b/include/liFFT/libraries/cuFFT/traits/LibTypes.hpp
@@ -16,8 +16,8 @@
  
 #pragma once
 
-#include "libLiFFT/libraries/cuFFT/traits/Types.hpp"
-#include "libLiFFT/c++14_types.hpp"
+#include "liFFT/libraries/cuFFT/traits/Types.hpp"
+#include "liFFT/c++14_types.hpp"
 
 namespace LiFFT {
 namespace libraries {
diff --git a/include/libLiFFT/libraries/cuFFT/traits/Sign.hpp b/include/liFFT/libraries/cuFFT/traits/Sign.hpp
similarity index 100%
rename from include/libLiFFT/libraries/cuFFT/traits/Sign.hpp
rename to include/liFFT/libraries/cuFFT/traits/Sign.hpp
diff --git a/include/libLiFFT/libraries/cuFFT/traits/Types.hpp b/include/liFFT/libraries/cuFFT/traits/Types.hpp
similarity index 100%
rename from include/libLiFFT/libraries/cuFFT/traits/Types.hpp
rename to include/liFFT/libraries/cuFFT/traits/Types.hpp
diff --git a/include/libLiFFT/libraries/fftw/FFTW.hpp b/include/liFFT/libraries/fftw/FFTW.hpp
similarity index 95%
rename from include/libLiFFT/libraries/fftw/FFTW.hpp
rename to include/liFFT/libraries/fftw/FFTW.hpp
index b60d087..738cf74 100644
--- a/include/libLiFFT/libraries/fftw/FFTW.hpp
+++ b/include/liFFT/libraries/fftw/FFTW.hpp
@@ -17,9 +17,9 @@
 #pragma once
 
 #include <boost/utility.hpp>
-#include "libLiFFT/libraries/fftw/policies/Planner.hpp"
-#include "libLiFFT/libraries/fftw/policies/ExecutePlan.hpp"
-#include "libLiFFT/libraries/fftw/policies/FreePlan.hpp"
+#include "liFFT/libraries/fftw/policies/Planner.hpp"
+#include "liFFT/libraries/fftw/policies/ExecutePlan.hpp"
+#include "liFFT/libraries/fftw/policies/FreePlan.hpp"
 #include <boost/mpl/placeholders.hpp>
 
 namespace bmpl = boost::mpl;
diff --git a/include/libLiFFT/libraries/fftw/fftw3Include.h b/include/liFFT/libraries/fftw/fftw3Include.h
similarity index 100%
rename from include/libLiFFT/libraries/fftw/fftw3Include.h
rename to include/liFFT/libraries/fftw/fftw3Include.h
diff --git a/include/libLiFFT/libraries/fftw/policies/CreatePlan.hpp b/include/liFFT/libraries/fftw/policies/CreatePlan.hpp
similarity index 95%
rename from include/libLiFFT/libraries/fftw/policies/CreatePlan.hpp
rename to include/liFFT/libraries/fftw/policies/CreatePlan.hpp
index 101b3e5..0619b43 100644
--- a/include/libLiFFT/libraries/fftw/policies/CreatePlan.hpp
+++ b/include/liFFT/libraries/fftw/policies/CreatePlan.hpp
@@ -16,9 +16,9 @@
  
 #pragma once
 
-#include "libLiFFT/libraries/fftw/fftw3Include.h"
-#include "libLiFFT/libraries/fftw/traits/LibTypes.hpp"
-#include "libLiFFT/ignore_unused.hpp"
+#include "liFFT/libraries/fftw/fftw3Include.h"
+#include "liFFT/libraries/fftw/traits/LibTypes.hpp"
+#include "liFFT/ignore_unused.hpp"
 
 namespace LiFFT {
 namespace libraries {
diff --git a/include/libLiFFT/libraries/fftw/policies/ExecutePlan.hpp b/include/liFFT/libraries/fftw/policies/ExecutePlan.hpp
similarity index 93%
rename from include/libLiFFT/libraries/fftw/policies/ExecutePlan.hpp
rename to include/liFFT/libraries/fftw/policies/ExecutePlan.hpp
index a07366c..8f173ce 100644
--- a/include/libLiFFT/libraries/fftw/policies/ExecutePlan.hpp
+++ b/include/liFFT/libraries/fftw/policies/ExecutePlan.hpp
@@ -16,8 +16,8 @@
  
 #pragma once
 
-#include "libLiFFT/libraries/fftw/fftw3Include.h"
-#include "libLiFFT/libraries/fftw/traits/LibTypes.hpp"
+#include "liFFT/libraries/fftw/fftw3Include.h"
+#include "liFFT/libraries/fftw/traits/LibTypes.hpp"
 
 namespace LiFFT {
 namespace libraries {
diff --git a/include/libLiFFT/libraries/fftw/policies/FreePlan.hpp b/include/liFFT/libraries/fftw/policies/FreePlan.hpp
similarity index 93%
rename from include/libLiFFT/libraries/fftw/policies/FreePlan.hpp
rename to include/liFFT/libraries/fftw/policies/FreePlan.hpp
index 324955a..6c15e02 100644
--- a/include/libLiFFT/libraries/fftw/policies/FreePlan.hpp
+++ b/include/liFFT/libraries/fftw/policies/FreePlan.hpp
@@ -16,8 +16,8 @@
  
 #pragma once
 
-#include "libLiFFT/libraries/fftw/fftw3Include.h"
-#include "libLiFFT/libraries/fftw/traits/LibTypes.hpp"
+#include "liFFT/libraries/fftw/fftw3Include.h"
+#include "liFFT/libraries/fftw/traits/LibTypes.hpp"
 
 namespace LiFFT {
 namespace libraries {
diff --git a/include/libLiFFT/libraries/fftw/policies/Planner.hpp b/include/liFFT/libraries/fftw/policies/Planner.hpp
similarity index 95%
rename from include/libLiFFT/libraries/fftw/policies/Planner.hpp
rename to include/liFFT/libraries/fftw/policies/Planner.hpp
index 811fb87..b0e4a1b 100644
--- a/include/libLiFFT/libraries/fftw/policies/Planner.hpp
+++ b/include/liFFT/libraries/fftw/policies/Planner.hpp
@@ -16,12 +16,12 @@
  
 #pragma once
 
-#include <libLiFFT/policies/SafePtrCast.hpp>
+#include "liFFT/policies/SafePtrCast.hpp"
+#include "liFFT/types/TypePair.hpp"
+#include "liFFT/libraries/fftw/traits/Sign.hpp"
+#include "liFFT/libraries/fftw/policies/CreatePlan.hpp"
+#include "liFFT/c++14_types.hpp"
 #include <cassert>
-#include "libLiFFT/types/TypePair.hpp"
-#include "libLiFFT/libraries/fftw/traits/Sign.hpp"
-#include "libLiFFT/libraries/fftw/policies/CreatePlan.hpp"
-#include "libLiFFT/c++14_types.hpp"
 
 namespace LiFFT {
 namespace libraries {
diff --git a/include/libLiFFT/libraries/fftw/traits/LibTypes.hpp b/include/liFFT/libraries/fftw/traits/LibTypes.hpp
similarity index 95%
rename from include/libLiFFT/libraries/fftw/traits/LibTypes.hpp
rename to include/liFFT/libraries/fftw/traits/LibTypes.hpp
index 6767d08..24a732a 100644
--- a/include/libLiFFT/libraries/fftw/traits/LibTypes.hpp
+++ b/include/liFFT/libraries/fftw/traits/LibTypes.hpp
@@ -16,8 +16,8 @@
  
 #pragma once
 
-#include "libLiFFT/traits/IsBinaryCompatible.hpp"
-#include "libLiFFT/types/Complex.hpp"
+#include "liFFT/traits/IsBinaryCompatible.hpp"
+#include "liFFT/types/Complex.hpp"
 
 namespace LiFFT {
 namespace libraries {
diff --git a/include/libLiFFT/libraries/fftw/traits/Sign.hpp b/include/liFFT/libraries/fftw/traits/Sign.hpp
similarity index 95%
rename from include/libLiFFT/libraries/fftw/traits/Sign.hpp
rename to include/liFFT/libraries/fftw/traits/Sign.hpp
index 269ee61..81edb72 100644
--- a/include/libLiFFT/libraries/fftw/traits/Sign.hpp
+++ b/include/liFFT/libraries/fftw/traits/Sign.hpp
@@ -16,7 +16,7 @@
  
 #pragma once
 
-#include "libLiFFT/libraries/fftw/fftw3Include.h"
+#include "liFFT/libraries/fftw/fftw3Include.h"
 
 namespace LiFFT {
 namespace libraries {
diff --git a/include/libLiFFT/mem/AoSValues.hpp b/include/liFFT/mem/AoSValues.hpp
similarity index 96%
rename from include/libLiFFT/mem/AoSValues.hpp
rename to include/liFFT/mem/AoSValues.hpp
index 6db0234..d1cb635 100644
--- a/include/libLiFFT/mem/AoSValues.hpp
+++ b/include/liFFT/mem/AoSValues.hpp
@@ -17,9 +17,9 @@
 #pragma once
 
 #include <memory>
-#include "libLiFFT/traits/IntegralType.hpp"
-#include "libLiFFT/traits/IsComplex.hpp"
-#include "libLiFFT/accessors/ArrayAccessor.hpp"
+#include "liFFT/traits/IntegralType.hpp"
+#include "liFFT/traits/IsComplex.hpp"
+#include "liFFT/accessors/ArrayAccessor.hpp"
 
 #include <cassert>
 
diff --git a/include/libLiFFT/mem/ComplexAoSValues.hpp b/include/liFFT/mem/ComplexAoSValues.hpp
similarity index 93%
rename from include/libLiFFT/mem/ComplexAoSValues.hpp
rename to include/liFFT/mem/ComplexAoSValues.hpp
index cea0228..66e5ed4 100644
--- a/include/libLiFFT/mem/ComplexAoSValues.hpp
+++ b/include/liFFT/mem/ComplexAoSValues.hpp
@@ -17,8 +17,8 @@
 #pragma once
 
 #include <memory>
-#include "libLiFFT/types/Complex.hpp"
-#include "libLiFFT/mem/AoSValues.hpp"
+#include "liFFT/types/Complex.hpp"
+#include "liFFT/mem/AoSValues.hpp"
 
 namespace LiFFT {
 namespace mem {
diff --git a/include/libLiFFT/mem/ComplexSoAValues.hpp b/include/liFFT/mem/ComplexSoAValues.hpp
similarity index 96%
rename from include/libLiFFT/mem/ComplexSoAValues.hpp
rename to include/liFFT/mem/ComplexSoAValues.hpp
index 8c116aa..10c6ba9 100644
--- a/include/libLiFFT/mem/ComplexSoAValues.hpp
+++ b/include/liFFT/mem/ComplexSoAValues.hpp
@@ -16,9 +16,9 @@
  
 #pragma once
 
-#include "libLiFFT/mem/RealValues.hpp"
-#include "libLiFFT/types/Complex.hpp"
-#include "libLiFFT/accessors/ArrayAccessor.hpp"
+#include "liFFT/mem/RealValues.hpp"
+#include "liFFT/types/Complex.hpp"
+#include "liFFT/accessors/ArrayAccessor.hpp"
 
 namespace LiFFT {
     namespace mem {
diff --git a/include/libLiFFT/mem/DataContainer.hpp b/include/liFFT/mem/DataContainer.hpp
similarity index 95%
rename from include/libLiFFT/mem/DataContainer.hpp
rename to include/liFFT/mem/DataContainer.hpp
index 653e7c0..547e553 100644
--- a/include/libLiFFT/mem/DataContainer.hpp
+++ b/include/liFFT/mem/DataContainer.hpp
@@ -16,19 +16,19 @@
  
 #pragma once
 
-#include "libLiFFT/traits/IntegralType.hpp"
-#include "libLiFFT/traits/IsComplex.hpp"
-#include "libLiFFT/traits/IsAoS.hpp"
-#include "libLiFFT/types/Vec.hpp"
-#include "libLiFFT/accessors/DataContainerAccessor.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
-#include "libLiFFT/policies/GetNumElements.hpp"
-#include "libLiFFT/traits/IdentityAccessor.hpp"
-#include "libLiFFT/traits/GetMemSize.hpp"
-#include "libLiFFT/mem/RealValues.hpp"
-#include "libLiFFT/mem/ComplexAoSValues.hpp"
-#include "libLiFFT/void_t.hpp"
-#include "libLiFFT/c++14_types.hpp"
+#include "liFFT/traits/IntegralType.hpp"
+#include "liFFT/traits/IsComplex.hpp"
+#include "liFFT/traits/IsAoS.hpp"
+#include "liFFT/types/Vec.hpp"
+#include "liFFT/accessors/DataContainerAccessor.hpp"
+#include "liFFT/policies/GetExtents.hpp"
+#include "liFFT/policies/GetNumElements.hpp"
+#include "liFFT/traits/IdentityAccessor.hpp"
+#include "liFFT/traits/GetMemSize.hpp"
+#include "liFFT/mem/RealValues.hpp"
+#include "liFFT/mem/ComplexAoSValues.hpp"
+#include "liFFT/void_t.hpp"
+#include "liFFT/c++14_types.hpp"
 
 #include <cassert>
 
diff --git a/include/libLiFFT/mem/FileContainer.hpp b/include/liFFT/mem/FileContainer.hpp
similarity index 93%
rename from include/libLiFFT/mem/FileContainer.hpp
rename to include/liFFT/mem/FileContainer.hpp
index 1d9a540..bc90798 100644
--- a/include/libLiFFT/mem/FileContainer.hpp
+++ b/include/liFFT/mem/FileContainer.hpp
@@ -16,16 +16,16 @@
  
 #pragma once
 
-#include "libLiFFT/mem/RealValues.hpp"
-#include "libLiFFT/mem/ComplexAoSValues.hpp"
-#include "libLiFFT/mem/DataContainer.hpp"
-#include "libLiFFT/traits/IsStrided.hpp"
-#include "libLiFFT/traits/IntegralType.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
-#include "libLiFFT/accessors/DataContainerAccessor.hpp"
-#include "libLiFFT/policies/GetNumElements.hpp"
-#include "libLiFFT/policies/Copy.hpp"
-#include "libLiFFT/c++14_types.hpp"
+#include "liFFT/mem/RealValues.hpp"
+#include "liFFT/mem/ComplexAoSValues.hpp"
+#include "liFFT/mem/DataContainer.hpp"
+#include "liFFT/traits/IsStrided.hpp"
+#include "liFFT/traits/IntegralType.hpp"
+#include "liFFT/policies/GetExtents.hpp"
+#include "liFFT/accessors/DataContainerAccessor.hpp"
+#include "liFFT/policies/GetNumElements.hpp"
+#include "liFFT/policies/Copy.hpp"
+#include "liFFT/c++14_types.hpp"
 
 #include <boost/mpl/apply.hpp>
 
diff --git a/include/libLiFFT/mem/PlainPtrWrapper.hpp b/include/liFFT/mem/PlainPtrWrapper.hpp
similarity index 92%
rename from include/libLiFFT/mem/PlainPtrWrapper.hpp
rename to include/liFFT/mem/PlainPtrWrapper.hpp
index c9b7079..432d5ec 100644
--- a/include/libLiFFT/mem/PlainPtrWrapper.hpp
+++ b/include/liFFT/mem/PlainPtrWrapper.hpp
@@ -16,18 +16,18 @@
  
 #pragma once
 
-#include "libLiFFT/policies/flattenIdx.hpp"
-#include "libLiFFT/mem/DataContainer.hpp"
-#include "libLiFFT/types/Vec.hpp"
-#include "libLiFFT/types/Real.hpp"
-#include "libLiFFT/types/Complex.hpp"
-#include "libLiFFT/util.hpp"
-#include "libLiFFT/policies/SafePtrCast.hpp"
-#include "libLiFFT/accessors/ArrayAccessor.hpp"
-#include "libLiFFT/c++14_types.hpp"
-#include "libLiFFT/traits/IntegralType.hpp"
-#include "libLiFFT/traits/IsComplex.hpp"
-#include "libLiFFT/traits/IsDeviceMemory.hpp"
+#include "liFFT/policies/flattenIdx.hpp"
+#include "liFFT/mem/DataContainer.hpp"
+#include "liFFT/types/Vec.hpp"
+#include "liFFT/types/Real.hpp"
+#include "liFFT/types/Complex.hpp"
+#include "liFFT/util.hpp"
+#include "liFFT/policies/SafePtrCast.hpp"
+#include "liFFT/accessors/ArrayAccessor.hpp"
+#include "liFFT/c++14_types.hpp"
+#include "liFFT/traits/IntegralType.hpp"
+#include "liFFT/traits/IsComplex.hpp"
+#include "liFFT/traits/IsDeviceMemory.hpp"
 
 namespace LiFFT {
 namespace mem {
diff --git a/include/libLiFFT/mem/RealValues.hpp b/include/liFFT/mem/RealValues.hpp
similarity index 93%
rename from include/libLiFFT/mem/RealValues.hpp
rename to include/liFFT/mem/RealValues.hpp
index 7abe610..c9fb0ca 100644
--- a/include/libLiFFT/mem/RealValues.hpp
+++ b/include/liFFT/mem/RealValues.hpp
@@ -16,8 +16,8 @@
  
 #pragma once
 
-#include "libLiFFT/types/Real.hpp"
-#include "libLiFFT/mem/AoSValues.hpp"
+#include "liFFT/types/Real.hpp"
+#include "liFFT/mem/AoSValues.hpp"
 
 namespace LiFFT {
 namespace mem {
diff --git a/include/libLiFFT/policies/CalcIntensity.hpp b/include/liFFT/policies/CalcIntensity.hpp
similarity index 96%
rename from include/libLiFFT/policies/CalcIntensity.hpp
rename to include/liFFT/policies/CalcIntensity.hpp
index 29247df..bdec170 100644
--- a/include/libLiFFT/policies/CalcIntensity.hpp
+++ b/include/liFFT/policies/CalcIntensity.hpp
@@ -16,8 +16,8 @@
  
 #pragma once
 
-#include "libLiFFT/traits/IsComplex.hpp"
-#include "libLiFFT/traits/IntegralType.hpp"
+#include "liFFT/traits/IsComplex.hpp"
+#include "liFFT/traits/IntegralType.hpp"
 #include <type_traits>
 
 namespace LiFFT {
diff --git a/include/libLiFFT/policies/CalcIntensityFunctor.hpp b/include/liFFT/policies/CalcIntensityFunctor.hpp
similarity index 97%
rename from include/libLiFFT/policies/CalcIntensityFunctor.hpp
rename to include/liFFT/policies/CalcIntensityFunctor.hpp
index e787e10..d0df2e8 100644
--- a/include/libLiFFT/policies/CalcIntensityFunctor.hpp
+++ b/include/liFFT/policies/CalcIntensityFunctor.hpp
@@ -16,7 +16,7 @@
  
 #pragma once
 
-#include "libLiFFT/traits/IsComplex.hpp"
+#include "liFFT/traits/IsComplex.hpp"
 
 namespace LiFFT {
 namespace policies {
diff --git a/include/libLiFFT/policies/Copy.hpp b/include/liFFT/policies/Copy.hpp
similarity index 98%
rename from include/libLiFFT/policies/Copy.hpp
rename to include/liFFT/policies/Copy.hpp
index fd5619c..806f0c0 100644
--- a/include/libLiFFT/policies/Copy.hpp
+++ b/include/liFFT/policies/Copy.hpp
@@ -16,10 +16,10 @@
  
 #pragma once
 
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/traits/AccessorTraits.hpp"
-#include "libLiFFT/policies/Loop.hpp"
-#include "libLiFFT/c++14_types.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/traits/AccessorTraits.hpp"
+#include "liFFT/policies/Loop.hpp"
+#include "liFFT/c++14_types.hpp"
 
 namespace LiFFT {
 namespace policies {
diff --git a/include/libLiFFT/policies/GetExtents.hpp b/include/liFFT/policies/GetExtents.hpp
similarity index 99%
rename from include/libLiFFT/policies/GetExtents.hpp
rename to include/liFFT/policies/GetExtents.hpp
index 473e390..5a138de 100644
--- a/include/libLiFFT/policies/GetExtents.hpp
+++ b/include/liFFT/policies/GetExtents.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <boost/utility.hpp>
-#include "libLiFFT/traits/NumDims.hpp"
+#include "liFFT/traits/NumDims.hpp"
 
 namespace LiFFT {
 namespace policies {
diff --git a/include/libLiFFT/policies/GetExtentsRawPtr.hpp b/include/liFFT/policies/GetExtentsRawPtr.hpp
similarity index 96%
rename from include/libLiFFT/policies/GetExtentsRawPtr.hpp
rename to include/liFFT/policies/GetExtentsRawPtr.hpp
index a55b3be..85a383b 100644
--- a/include/libLiFFT/policies/GetExtentsRawPtr.hpp
+++ b/include/liFFT/policies/GetExtentsRawPtr.hpp
@@ -18,9 +18,9 @@
 
 #include <boost/utility.hpp>
 #include <array>
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
-#include "libLiFFT/c++14_types.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/policies/GetExtents.hpp"
+#include "liFFT/c++14_types.hpp"
 
 namespace LiFFT {
 namespace policies {
diff --git a/include/libLiFFT/policies/GetNumElements.hpp b/include/liFFT/policies/GetNumElements.hpp
similarity index 96%
rename from include/libLiFFT/policies/GetNumElements.hpp
rename to include/liFFT/policies/GetNumElements.hpp
index 18b3c73..47186b6 100644
--- a/include/libLiFFT/policies/GetNumElements.hpp
+++ b/include/liFFT/policies/GetNumElements.hpp
@@ -16,9 +16,9 @@
  
 #pragma once
 
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
-#include "libLiFFT/policies/GetStrides.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/policies/GetExtents.hpp"
+#include "liFFT/policies/GetStrides.hpp"
 
 namespace LiFFT {
 namespace policies {
diff --git a/include/libLiFFT/policies/GetStrides.hpp b/include/liFFT/policies/GetStrides.hpp
similarity index 94%
rename from include/libLiFFT/policies/GetStrides.hpp
rename to include/liFFT/policies/GetStrides.hpp
index 4905e66..bea74bc 100644
--- a/include/libLiFFT/policies/GetStrides.hpp
+++ b/include/liFFT/policies/GetStrides.hpp
@@ -17,10 +17,10 @@
 #pragma once
 
 #include <boost/utility.hpp>
-#include "libLiFFT/traits/IsStrided.hpp"
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
-#include "libLiFFT/types/Vec.hpp"
+#include "liFFT/traits/IsStrided.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/policies/GetExtents.hpp"
+#include "liFFT/types/Vec.hpp"
 
 namespace LiFFT {
 namespace policies {
diff --git a/include/libLiFFT/policies/IntensityCalculator.hpp b/include/liFFT/policies/IntensityCalculator.hpp
similarity index 95%
rename from include/libLiFFT/policies/IntensityCalculator.hpp
rename to include/liFFT/policies/IntensityCalculator.hpp
index 52c5ea7..1ff8276 100644
--- a/include/libLiFFT/policies/IntensityCalculator.hpp
+++ b/include/liFFT/policies/IntensityCalculator.hpp
@@ -16,11 +16,11 @@
  
 #pragma once
 
-#include "libLiFFT/traits/IsComplex.hpp"
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/types/Vec.hpp"
-#include "libLiFFT/policies/SafePtrCast.hpp"
-#include "libLiFFT/testLib/IntensityLibrary.hpp"
+#include "liFFT/traits/IsComplex.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/types/Vec.hpp"
+#include "liFFT/policies/SafePtrCast.hpp"
+#include "liFFT/testLib/IntensityLibrary.hpp"
 #include <boost/array.hpp>
 
 namespace LiFFT {
diff --git a/include/libLiFFT/policies/Loop.hpp b/include/liFFT/policies/Loop.hpp
similarity index 96%
rename from include/libLiFFT/policies/Loop.hpp
rename to include/liFFT/policies/Loop.hpp
index d07ff9d..20497ad 100644
--- a/include/libLiFFT/policies/Loop.hpp
+++ b/include/liFFT/policies/Loop.hpp
@@ -16,10 +16,10 @@
  
 #pragma once
 
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
-#include "libLiFFT/types/Vec.hpp"
-#include "libLiFFT/c++14_types.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/policies/GetExtents.hpp"
+#include "liFFT/types/Vec.hpp"
+#include "liFFT/c++14_types.hpp"
 
 namespace LiFFT {
 namespace policies {
diff --git a/include/libLiFFT/policies/SafePtrCast.hpp b/include/liFFT/policies/SafePtrCast.hpp
similarity index 97%
rename from include/libLiFFT/policies/SafePtrCast.hpp
rename to include/liFFT/policies/SafePtrCast.hpp
index 7ef3e51..4f472f4 100644
--- a/include/libLiFFT/policies/SafePtrCast.hpp
+++ b/include/liFFT/policies/SafePtrCast.hpp
@@ -17,9 +17,9 @@
 #pragma once
 
 #include <boost/utility.hpp>
-#include "libLiFFT/traits/IsBinaryCompatible.hpp"
-#include "libLiFFT/c++14_types.hpp"
-#include "libLiFFT/void_t.hpp"
+#include "liFFT/traits/IsBinaryCompatible.hpp"
+#include "liFFT/c++14_types.hpp"
+#include "liFFT/void_t.hpp"
 
 namespace LiFFT {
 namespace policies {
diff --git a/include/libLiFFT/policies/flattenIdx.hpp b/include/liFFT/policies/flattenIdx.hpp
similarity index 93%
rename from include/libLiFFT/policies/flattenIdx.hpp
rename to include/liFFT/policies/flattenIdx.hpp
index 1cbbc0f..8afd8fc 100644
--- a/include/libLiFFT/policies/flattenIdx.hpp
+++ b/include/liFFT/policies/flattenIdx.hpp
@@ -16,11 +16,11 @@
  
 #pragma once
 
-#include "libLiFFT/policies/GetExtents.hpp"
-#include "libLiFFT/policies/GetStrides.hpp"
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/traits/IsStrided.hpp"
-#include "libLiFFT/c++14_types.hpp"
+#include "liFFT/policies/GetExtents.hpp"
+#include "liFFT/policies/GetStrides.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/traits/IsStrided.hpp"
+#include "liFFT/c++14_types.hpp"
 #include <cassert>
 
 namespace LiFFT {
diff --git a/include/libLiFFT/testLib/IntensityLibrary.hpp b/include/liFFT/testLib/IntensityLibrary.hpp
similarity index 100%
rename from include/libLiFFT/testLib/IntensityLibrary.hpp
rename to include/liFFT/testLib/IntensityLibrary.hpp
diff --git a/include/libLiFFT/traits/AccessorTraits.hpp b/include/liFFT/traits/AccessorTraits.hpp
similarity index 95%
rename from include/libLiFFT/traits/AccessorTraits.hpp
rename to include/liFFT/traits/AccessorTraits.hpp
index 6f2b61f..d2d82f3 100644
--- a/include/libLiFFT/traits/AccessorTraits.hpp
+++ b/include/liFFT/traits/AccessorTraits.hpp
@@ -16,10 +16,10 @@
  
 #pragma once
 
-#include "libLiFFT/void_t.hpp"
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/types/Vec.hpp"
-#include "libLiFFT/c++14_types.hpp"
+#include "liFFT/void_t.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/types/Vec.hpp"
+#include "liFFT/c++14_types.hpp"
 #include <type_traits>
 
 namespace LiFFT {
diff --git a/include/libLiFFT/traits/GetMemSize.hpp b/include/liFFT/traits/GetMemSize.hpp
similarity index 100%
rename from include/libLiFFT/traits/GetMemSize.hpp
rename to include/liFFT/traits/GetMemSize.hpp
diff --git a/include/libLiFFT/traits/IdentityAccessor.hpp b/include/liFFT/traits/IdentityAccessor.hpp
similarity index 97%
rename from include/libLiFFT/traits/IdentityAccessor.hpp
rename to include/liFFT/traits/IdentityAccessor.hpp
index 7c7adfc..c90d0ad 100644
--- a/include/libLiFFT/traits/IdentityAccessor.hpp
+++ b/include/liFFT/traits/IdentityAccessor.hpp
@@ -16,7 +16,7 @@
  
 #pragma once
 
-#include "libLiFFT/accessors/ArrayAccessor.hpp"
+#include "liFFT/accessors/ArrayAccessor.hpp"
 
 namespace LiFFT {
 namespace traits {
diff --git a/include/libLiFFT/traits/IntegralType.hpp b/include/liFFT/traits/IntegralType.hpp
similarity index 94%
rename from include/libLiFFT/traits/IntegralType.hpp
rename to include/liFFT/traits/IntegralType.hpp
index 93a8fa1..817edba 100644
--- a/include/libLiFFT/traits/IntegralType.hpp
+++ b/include/liFFT/traits/IntegralType.hpp
@@ -17,9 +17,9 @@
 #pragma once
 
 #include <type_traits>
-#include "libLiFFT/traits/RemoveModifiers.hpp"
-#include "libLiFFT/void_t.hpp"
-#include "libLiFFT/c++14_types.hpp"
+#include "liFFT/traits/RemoveModifiers.hpp"
+#include "liFFT/void_t.hpp"
+#include "liFFT/c++14_types.hpp"
 
 namespace LiFFT {
 namespace traits {
diff --git a/include/libLiFFT/traits/IsAoS.hpp b/include/liFFT/traits/IsAoS.hpp
similarity index 97%
rename from include/libLiFFT/traits/IsAoS.hpp
rename to include/liFFT/traits/IsAoS.hpp
index 74ba935..954f7e6 100644
--- a/include/libLiFFT/traits/IsAoS.hpp
+++ b/include/liFFT/traits/IsAoS.hpp
@@ -16,7 +16,7 @@
  
 #pragma once
 
-#include "libLiFFT/traits/IsComplex.hpp"
+#include "liFFT/traits/IsComplex.hpp"
 
 namespace LiFFT {
 namespace traits {
diff --git a/include/libLiFFT/traits/IsBinaryCompatible.hpp b/include/liFFT/traits/IsBinaryCompatible.hpp
similarity index 97%
rename from include/libLiFFT/traits/IsBinaryCompatible.hpp
rename to include/liFFT/traits/IsBinaryCompatible.hpp
index 6818383..0d34917 100644
--- a/include/libLiFFT/traits/IsBinaryCompatible.hpp
+++ b/include/liFFT/traits/IsBinaryCompatible.hpp
@@ -16,7 +16,7 @@
  
 #pragma once
 
-#include "libLiFFT/c++14_types.hpp"
+#include "liFFT/c++14_types.hpp"
 
 namespace LiFFT {
 namespace traits {
diff --git a/include/libLiFFT/traits/IsComplex.hpp b/include/liFFT/traits/IsComplex.hpp
similarity index 97%
rename from include/libLiFFT/traits/IsComplex.hpp
rename to include/liFFT/traits/IsComplex.hpp
index 154167b..89c9e89 100644
--- a/include/libLiFFT/traits/IsComplex.hpp
+++ b/include/liFFT/traits/IsComplex.hpp
@@ -16,7 +16,7 @@
  
 #pragma once
 
-#include "libLiFFT/void_t.hpp"
+#include "liFFT/void_t.hpp"
 
 namespace LiFFT {
 namespace traits {
diff --git a/include/libLiFFT/traits/IsDeviceMemory.hpp b/include/liFFT/traits/IsDeviceMemory.hpp
similarity index 100%
rename from include/libLiFFT/traits/IsDeviceMemory.hpp
rename to include/liFFT/traits/IsDeviceMemory.hpp
diff --git a/include/libLiFFT/traits/IsInplace.hpp b/include/liFFT/traits/IsInplace.hpp
similarity index 100%
rename from include/libLiFFT/traits/IsInplace.hpp
rename to include/liFFT/traits/IsInplace.hpp
diff --git a/include/libLiFFT/traits/IsStrided.hpp b/include/liFFT/traits/IsStrided.hpp
similarity index 97%
rename from include/libLiFFT/traits/IsStrided.hpp
rename to include/liFFT/traits/IsStrided.hpp
index 7e1a1f2..81facc2 100644
--- a/include/libLiFFT/traits/IsStrided.hpp
+++ b/include/liFFT/traits/IsStrided.hpp
@@ -16,7 +16,7 @@
  
 #pragma once
 
-#include "libLiFFT/void_t.hpp"
+#include "liFFT/void_t.hpp"
 
 namespace LiFFT {
 namespace traits {
diff --git a/include/libLiFFT/traits/NumDims.hpp b/include/liFFT/traits/NumDims.hpp
similarity index 97%
rename from include/libLiFFT/traits/NumDims.hpp
rename to include/liFFT/traits/NumDims.hpp
index faa6b21..8d330b7 100644
--- a/include/libLiFFT/traits/NumDims.hpp
+++ b/include/liFFT/traits/NumDims.hpp
@@ -16,7 +16,7 @@
  
 #pragma once
 
-#include "libLiFFT/void_t.hpp"
+#include "liFFT/void_t.hpp"
 
 namespace LiFFT {
 namespace traits {
diff --git a/include/libLiFFT/traits/RemoveModifiers.hpp b/include/liFFT/traits/RemoveModifiers.hpp
similarity index 100%
rename from include/libLiFFT/traits/RemoveModifiers.hpp
rename to include/liFFT/traits/RemoveModifiers.hpp
diff --git a/include/libLiFFT/types/AddDimsWrapper.hpp b/include/liFFT/types/AddDimsWrapper.hpp
similarity index 100%
rename from include/libLiFFT/types/AddDimsWrapper.hpp
rename to include/liFFT/types/AddDimsWrapper.hpp
diff --git a/include/libLiFFT/types/Complex.hpp b/include/liFFT/types/Complex.hpp
similarity index 96%
rename from include/libLiFFT/types/Complex.hpp
rename to include/liFFT/types/Complex.hpp
index 8be51b0..b5f364f 100644
--- a/include/libLiFFT/types/Complex.hpp
+++ b/include/liFFT/types/Complex.hpp
@@ -16,9 +16,9 @@
  
 #pragma once
 
-#include "libLiFFT/traits/IsBinaryCompatible.hpp"
-#include "libLiFFT/types/Real.hpp"
-#include "libLiFFT/c++14_types.hpp"
+#include "liFFT/traits/IsBinaryCompatible.hpp"
+#include "liFFT/types/Real.hpp"
+#include "liFFT/c++14_types.hpp"
 
 namespace LiFFT {
 namespace types {
diff --git a/include/libLiFFT/types/Range.hpp b/include/liFFT/types/Range.hpp
similarity index 96%
rename from include/libLiFFT/types/Range.hpp
rename to include/liFFT/types/Range.hpp
index ad5af51..6495176 100644
--- a/include/libLiFFT/types/Range.hpp
+++ b/include/liFFT/types/Range.hpp
@@ -16,9 +16,9 @@
  
 #pragma once
 
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
-#include "libLiFFT/types/Vec.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/policies/GetExtents.hpp"
+#include "liFFT/types/Vec.hpp"
 
 namespace LiFFT {
 namespace types {
diff --git a/include/libLiFFT/types/Real.hpp b/include/liFFT/types/Real.hpp
similarity index 95%
rename from include/libLiFFT/types/Real.hpp
rename to include/liFFT/types/Real.hpp
index 664a0ab..3937238 100644
--- a/include/libLiFFT/types/Real.hpp
+++ b/include/liFFT/types/Real.hpp
@@ -16,7 +16,7 @@
  
 #pragma once
 
-#include "libLiFFT/traits/IsBinaryCompatible.hpp"
+#include "liFFT/traits/IsBinaryCompatible.hpp"
 
 namespace LiFFT {
 namespace types {
diff --git a/include/libLiFFT/types/SliceView.hpp b/include/liFFT/types/SliceView.hpp
similarity index 94%
rename from include/libLiFFT/types/SliceView.hpp
rename to include/liFFT/types/SliceView.hpp
index c01c7ec..13ccf5a 100644
--- a/include/libLiFFT/types/SliceView.hpp
+++ b/include/liFFT/types/SliceView.hpp
@@ -16,16 +16,16 @@
  
 #pragma once
 
-#include "libLiFFT/types/Vec.hpp"
-#include "libLiFFT/traits/IdentityAccessor.hpp"
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/accessors/ArrayAccessor.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
-#include "libLiFFT/types/Range.hpp"
-#include "libLiFFT/traits/IntegralType.hpp"
-#include "libLiFFT/traits/IsComplex.hpp"
-#include "libLiFFT/traits/IsStrided.hpp"
-#include "libLiFFT/traits/IsAoS.hpp"
+#include "liFFT/types/Vec.hpp"
+#include "liFFT/traits/IdentityAccessor.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/accessors/ArrayAccessor.hpp"
+#include "liFFT/policies/GetExtents.hpp"
+#include "liFFT/types/Range.hpp"
+#include "liFFT/traits/IntegralType.hpp"
+#include "liFFT/traits/IsComplex.hpp"
+#include "liFFT/traits/IsStrided.hpp"
+#include "liFFT/traits/IsAoS.hpp"
 
 namespace LiFFT {
 namespace types {
diff --git a/include/libLiFFT/types/SymmetricWrapper.hpp b/include/liFFT/types/SymmetricWrapper.hpp
similarity index 94%
rename from include/libLiFFT/types/SymmetricWrapper.hpp
rename to include/liFFT/types/SymmetricWrapper.hpp
index 0d5f7b2..08b4b94 100644
--- a/include/libLiFFT/types/SymmetricWrapper.hpp
+++ b/include/liFFT/types/SymmetricWrapper.hpp
@@ -16,14 +16,14 @@
  
 #pragma once
 
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/traits/IdentityAccessor.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
-#include "libLiFFT/accessors/ArrayAccessor.hpp"
-#include "libLiFFT/types/Complex.hpp"
-#include "libLiFFT/c++14_types.hpp"
-#include "libLiFFT/traits/IsComplex.hpp"
-#include "libLiFFT/traits/GetMemSize.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/traits/IdentityAccessor.hpp"
+#include "liFFT/policies/GetExtents.hpp"
+#include "liFFT/accessors/ArrayAccessor.hpp"
+#include "liFFT/types/Complex.hpp"
+#include "liFFT/c++14_types.hpp"
+#include "liFFT/traits/IsComplex.hpp"
+#include "liFFT/traits/GetMemSize.hpp"
 
 namespace LiFFT {
     namespace types {
diff --git a/include/libLiFFT/types/TypePair.hpp b/include/liFFT/types/TypePair.hpp
similarity index 100%
rename from include/libLiFFT/types/TypePair.hpp
rename to include/liFFT/types/TypePair.hpp
diff --git a/include/libLiFFT/types/Vec.hpp b/include/liFFT/types/Vec.hpp
similarity index 99%
rename from include/libLiFFT/types/Vec.hpp
rename to include/liFFT/types/Vec.hpp
index 50825de..e65ad90 100644
--- a/include/libLiFFT/types/Vec.hpp
+++ b/include/liFFT/types/Vec.hpp
@@ -18,7 +18,7 @@
 
 #include <cassert>
 #include <memory>
-#include "libLiFFT/c++14_types.hpp"
+#include "liFFT/c++14_types.hpp"
 
 namespace LiFFT{
 namespace types{
diff --git a/include/libLiFFT/types/View.hpp b/include/liFFT/types/View.hpp
similarity index 92%
rename from include/libLiFFT/types/View.hpp
rename to include/liFFT/types/View.hpp
index 3a575ae..20bbda8 100644
--- a/include/libLiFFT/types/View.hpp
+++ b/include/liFFT/types/View.hpp
@@ -16,16 +16,16 @@
  
 #pragma once
 
-#include "libLiFFT/types/Vec.hpp"
-#include "libLiFFT/traits/IdentityAccessor.hpp"
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/accessors/ArrayAccessor.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
-#include "libLiFFT/types/Range.hpp"
-#include "libLiFFT/traits/IntegralType.hpp"
-#include "libLiFFT/traits/IsComplex.hpp"
-#include "libLiFFT/traits/IsStrided.hpp"
-#include "libLiFFT/traits/IsAoS.hpp"
+#include "liFFT/types/Vec.hpp"
+#include "liFFT/traits/IdentityAccessor.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/accessors/ArrayAccessor.hpp"
+#include "liFFT/policies/GetExtents.hpp"
+#include "liFFT/types/Range.hpp"
+#include "liFFT/traits/IntegralType.hpp"
+#include "liFFT/traits/IsComplex.hpp"
+#include "liFFT/traits/IsStrided.hpp"
+#include "liFFT/traits/IsAoS.hpp"
 
 namespace LiFFT {
 namespace types {
diff --git a/include/libLiFFT/util.hpp b/include/liFFT/util.hpp
similarity index 98%
rename from include/libLiFFT/util.hpp
rename to include/liFFT/util.hpp
index 7d12022..e475558 100644
--- a/include/libLiFFT/util.hpp
+++ b/include/liFFT/util.hpp
@@ -16,7 +16,7 @@
  
 #pragma once
 
-#include "libLiFFT/c++14_types.hpp"
+#include "liFFT/c++14_types.hpp"
 #include <type_traits>
 
 namespace LiFFT {
diff --git a/include/libLiFFT/void_t.hpp b/include/liFFT/void_t.hpp
similarity index 100%
rename from include/libLiFFT/void_t.hpp
rename to include/liFFT/void_t.hpp
diff --git a/include/tiffWriter/converters.hpp b/include/tiffWriter/converters.hpp
index 20d3c44..db9fca1 100644
--- a/include/tiffWriter/converters.hpp
+++ b/include/tiffWriter/converters.hpp
@@ -20,7 +20,7 @@
 #include <limits>
 #include <algorithm>
 #include <array>
-#include "libLiFFT/c++14_types.hpp"
+#include "liFFT/c++14_types.hpp"
 
 namespace tiffWriter {
 
diff --git a/include/tiffWriter/traitsAndPolicies.hpp b/include/tiffWriter/traitsAndPolicies.hpp
index 25b8226..11d6a30 100644
--- a/include/tiffWriter/traitsAndPolicies.hpp
+++ b/include/tiffWriter/traitsAndPolicies.hpp
@@ -17,14 +17,14 @@
 #pragma once
 
 #include "tiffWriter/image.hpp"
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/traits/IdentityAccessor.hpp"
-#include "libLiFFT/traits/IsComplex.hpp"
-#include "libLiFFT/traits/IsStrided.hpp"
-#include "libLiFFT/accessors/VolumeAccessor.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
-#include "libLiFFT/types/Vec.hpp"
-#include "libLiFFT/util.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/traits/IdentityAccessor.hpp"
+#include "liFFT/traits/IsComplex.hpp"
+#include "liFFT/traits/IsStrided.hpp"
+#include "liFFT/accessors/VolumeAccessor.hpp"
+#include "liFFT/policies/GetExtents.hpp"
+#include "liFFT/types/Vec.hpp"
+#include "liFFT/util.hpp"
 
 namespace LiFFT {
 namespace traits {
diff --git a/reportVolumes/main.cpp b/reportVolumes/main.cpp
index e13add3..d8cc0f7 100644
--- a/reportVolumes/main.cpp
+++ b/reportVolumes/main.cpp
@@ -14,29 +14,28 @@
  * License along with libLiFFT.  If not, see <www.gnu.org/licenses/>.
  */
  
-#include <iostream>
-#include <string>
-
 #include "tiffWriter/image.hpp"
 #include "tiffWriter/traitsAndPolicies.hpp"
-#include "libLiFFT/FFT.hpp"
+#include "liFFT/FFT.hpp"
 #if defined(WITH_CUDA)
-#   include "libLiFFT/libraries/cuFFT/cuFFT.hpp"
+#   include "liFFT/libraries/cuFFT/cuFFT.hpp"
     using FFT_LIB = LiFFT::libraries::cuFFT::CuFFT<>;
 #else
-#   include "libLiFFT/libraries/fftw/FFTW.hpp"
+#   include "liFFT/libraries/fftw/FFTW.hpp"
     using FFT_LIB = LiFFT::libraries::fftw::FFTW<>;
 #endif
 
-#include "libLiFFT/policies/Copy.hpp"
-#include "libLiFFT/accessors/TransformAccessor.hpp"
-#include "libLiFFT/accessors/TransposeAccessor.hpp"
-#include "libLiFFT/policies/CalcIntensityFunctor.hpp"
-#include "libLiFFT/generateData.hpp"
-#include "libLiFFT/types/SliceView.hpp"
+#include "liFFT/policies/Copy.hpp"
+#include "liFFT/accessors/TransformAccessor.hpp"
+#include "liFFT/accessors/TransposeAccessor.hpp"
+#include "liFFT/policies/CalcIntensityFunctor.hpp"
+#include "liFFT/generateData.hpp"
+#include "liFFT/types/SliceView.hpp"
 
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
+#include <iostream>
+#include <string>
 #include <cmath>
 
 namespace po = boost::program_options;
diff --git a/test/IntensityCalculator_Test.hpp b/test/IntensityCalculator_Test.hpp
index 9f70539..855a845 100644
--- a/test/IntensityCalculator_Test.hpp
+++ b/test/IntensityCalculator_Test.hpp
@@ -16,8 +16,8 @@
  
 #pragma once
 
-#include "libLiFFT/policies/IntensityCalculator.hpp"
-#include "libLiFFT/policies/GetNumElements.hpp"
+#include "liFFT/policies/IntensityCalculator.hpp"
+#include "liFFT/policies/GetNumElements.hpp"
 
 void testIntensityCalculator()
 {
diff --git a/test/Volume.hpp b/test/Volume.hpp
index 6a34fd1..1bf4427 100644
--- a/test/Volume.hpp
+++ b/test/Volume.hpp
@@ -16,12 +16,12 @@
  
 #pragma once
 
-#include "libLiFFT/traits/IntegralType.hpp"
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/traits/IsComplex.hpp"
-#include "libLiFFT/traits/IsStrided.hpp"
-#include "libLiFFT/traits/IsAoS.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
+#include "liFFT/traits/IntegralType.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/traits/IsComplex.hpp"
+#include "liFFT/traits/IsStrided.hpp"
+#include "liFFT/traits/IsAoS.hpp"
+#include "liFFT/policies/GetExtents.hpp"
 
 template< typename T = double >
 class Volume{
diff --git a/test/VolumeAdapter.hpp b/test/VolumeAdapter.hpp
index 899ce9e..c477ab1 100644
--- a/test/VolumeAdapter.hpp
+++ b/test/VolumeAdapter.hpp
@@ -17,8 +17,8 @@
 #pragma once
 
 #include "Volume.hpp"
-#include "libLiFFT/traits/NumDims.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
+#include "liFFT/traits/NumDims.hpp"
+#include "liFFT/policies/GetExtents.hpp"
 
 template<typename T>
 class VolumeAdapter{
diff --git a/test/minIncludes.cpp b/test/minIncludes.cpp
index 920a091..2502e27 100644
--- a/test/minIncludes.cpp
+++ b/test/minIncludes.cpp
@@ -14,6 +14,6 @@
  * License along with libLiFFT.  If not, see <www.gnu.org/licenses/>.
  */
 
-#include "libLiFFT/FFT.hpp"
+#include "liFFT/FFT.hpp"
 int main( void ) { return 0; };
 
diff --git a/test/policyExample.hpp b/test/policyExample.hpp
index 679e73e..5abccdc 100644
--- a/test/policyExample.hpp
+++ b/test/policyExample.hpp
@@ -16,13 +16,13 @@
  
 #pragma once
 
-#include "libLiFFT/traits/IntegralType.hpp"
-#include "libLiFFT/traits/IsComplex.hpp"
-#include "libLiFFT/traits/IsAoS.hpp"
-#include "libLiFFT/policies/GetExtents.hpp"
-#include "libLiFFT/policies/GetStrides.hpp"
-#include "libLiFFT/accessors/DataContainerAccessor.hpp"
-#include "libLiFFT/policies/CalcIntensity.hpp"
+#include "liFFT/traits/IntegralType.hpp"
+#include "liFFT/traits/IsComplex.hpp"
+#include "liFFT/traits/IsAoS.hpp"
+#include "liFFT/policies/GetExtents.hpp"
+#include "liFFT/policies/GetStrides.hpp"
+#include "liFFT/accessors/DataContainerAccessor.hpp"
+#include "liFFT/policies/CalcIntensity.hpp"
 
 namespace LiFFT {
 
diff --git a/test/policyTest.hpp b/test/policyTest.hpp
index a4e3de0..307325c 100644
--- a/test/policyTest.hpp
+++ b/test/policyTest.hpp
@@ -19,10 +19,10 @@
 #include "policyExample.hpp"
 #include <chrono>
 #include <vector>
-#include "libLiFFT/mem/DataContainer.hpp"
-#include "libLiFFT/mem/RealValues.hpp"
-#include "libLiFFT/mem/ComplexAoSValues.hpp"
-#include "libLiFFT/mem/ComplexSoAValues.hpp"
+#include "liFFT/mem/DataContainer.hpp"
+#include "liFFT/mem/RealValues.hpp"
+#include "liFFT/mem/ComplexAoSValues.hpp"
+#include "liFFT/mem/ComplexSoAValues.hpp"
 
 
 using millisecs = std::chrono::duration<unsigned long long, std::milli>;
diff --git a/test/testCustomTypes.cpp b/test/testCustomTypes.cpp
index ba555a4..df532a6 100644
--- a/test/testCustomTypes.cpp
+++ b/test/testCustomTypes.cpp
@@ -16,19 +16,19 @@
  
 #include "testUtils.hpp"
 
-#include "libLiFFT/traits/IsComplex.hpp"
-#include "libLiFFT/traits/IsBinaryCompatible.hpp"
-#include "libLiFFT/traits/IntegralType.hpp"
-#include "libLiFFT/FFT.hpp"
+#include "liFFT/traits/IsComplex.hpp"
+#include "liFFT/traits/IsBinaryCompatible.hpp"
+#include "liFFT/traits/IntegralType.hpp"
+#include "liFFT/FFT.hpp"
 #include "Volume.hpp"
-#include "libLiFFT/accessors/VolumeAccessor.hpp"
+#include "liFFT/accessors/VolumeAccessor.hpp"
 #ifndef WITH_CUDA
-#   include "libLiFFT/libraries/fftw/fftw3Include.h"
+#   include "liFFT/libraries/fftw/fftw3Include.h"
 #endif
-#include "libLiFFT/generateData.hpp"
-#include "libLiFFT/policies/Copy.hpp"
-#include "libLiFFT/traits/IdentityAccessor.hpp"
-#include "libLiFFT/types/SliceView.hpp"
+#include "liFFT/generateData.hpp"
+#include "liFFT/policies/Copy.hpp"
+#include "liFFT/traits/IdentityAccessor.hpp"
+#include "liFFT/types/SliceView.hpp"
 #include <boost/test/unit_test.hpp>
 #include <type_traits>
 #include <iostream>
diff --git a/test/testDefines.hpp b/test/testDefines.hpp
index 427a420..3d9b530 100644
--- a/test/testDefines.hpp
+++ b/test/testDefines.hpp
@@ -16,13 +16,13 @@
  
 #pragma once
 
-#include "libLiFFT/mem/DataContainer.hpp"
-#include "libLiFFT/mem/RealValues.hpp"
-#include "libLiFFT/mem/ComplexAoSValues.hpp"
+#include "liFFT/mem/DataContainer.hpp"
+#include "liFFT/mem/RealValues.hpp"
+#include "liFFT/mem/ComplexAoSValues.hpp"
 #ifdef WITH_CUDA
-#include "libLiFFT/libraries/cuFFT/cuFFT.hpp"
+#include "liFFT/libraries/cuFFT/cuFFT.hpp"
 #else
-#include "libLiFFT/libraries/fftw/FFTW.hpp"
+#include "liFFT/libraries/fftw/FFTW.hpp"
 #endif
 
 namespace LiFFTTest{
diff --git a/test/testFile.cpp b/test/testFile.cpp
index daf7087..25af0bd 100644
--- a/test/testFile.cpp
+++ b/test/testFile.cpp
@@ -16,14 +16,14 @@
  
 #include "testUtils.hpp"
 
-#include "libLiFFT/mem/DataContainer.hpp"
-#include "libLiFFT/mem/FileContainer.hpp"
-#include "libLiFFT/accessors/ImageAccessor.hpp"
+#include "liFFT/mem/DataContainer.hpp"
+#include "liFFT/mem/FileContainer.hpp"
+#include "liFFT/accessors/ImageAccessor.hpp"
 #include "tiffWriter/image.hpp"
 #include "tiffWriter/traitsAndPolicies.hpp"
-#include "libLiFFT/FFT.hpp"
-#include "libLiFFT/generateData.hpp"
-#include "libLiFFT/accessors/TransposeAccessor.hpp"
+#include "liFFT/FFT.hpp"
+#include "liFFT/generateData.hpp"
+#include "liFFT/accessors/TransposeAccessor.hpp"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/testInplace.cpp b/test/testInplace.cpp
index 5d75abc..dcf1d53 100644
--- a/test/testInplace.cpp
+++ b/test/testInplace.cpp
@@ -15,10 +15,10 @@
  */
  
 #include "testUtils.hpp"
-#include "libLiFFT/FFT.hpp"
-#include "libLiFFT/generateData.hpp"
-#include "libLiFFT/types/View.hpp"
-#include "libLiFFT/types/SliceView.hpp"
+#include "liFFT/FFT.hpp"
+#include "liFFT/generateData.hpp"
+#include "liFFT/types/View.hpp"
+#include "liFFT/types/SliceView.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <cmath>
diff --git a/test/testPlainPtr.cpp b/test/testPlainPtr.cpp
index 1a0a9b6..60a4d67 100644
--- a/test/testPlainPtr.cpp
+++ b/test/testPlainPtr.cpp
@@ -15,11 +15,11 @@
  */
  
 #include "testUtils.hpp"
-#include "libLiFFT/types/Complex.hpp"
-#include "libLiFFT/types/Real.hpp"
-#include "libLiFFT/mem/PlainPtrWrapper.hpp"
-#include "libLiFFT/FFT.hpp"
-#include "libLiFFT/policies/Copy.hpp"
+#include "liFFT/types/Complex.hpp"
+#include "liFFT/types/Real.hpp"
+#include "liFFT/mem/PlainPtrWrapper.hpp"
+#include "liFFT/FFT.hpp"
+#include "liFFT/policies/Copy.hpp"
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
diff --git a/test/testUtils.cpp b/test/testUtils.cpp
index 1099013..61699ef 100644
--- a/test/testUtils.cpp
+++ b/test/testUtils.cpp
@@ -15,17 +15,17 @@
  */
  
 #include "testUtils.hpp"
-#include "libLiFFT/types/Vec.hpp"
-#include "libLiFFT/FFT.hpp"
-#include "libLiFFT/generateData.hpp"
-#include "libLiFFT/accessors/TransformAccessor.hpp"
-#include "libLiFFT/accessors/TransposeAccessor.hpp"
-#include "libLiFFT/types/SymmetricWrapper.hpp"
-#include "libLiFFT/accessors/StreamAccessor.hpp"
-#include "libLiFFT/types/AddDimsWrapper.hpp"
-#include "libLiFFT/policies/CalcIntensityFunctor.hpp"
-#include "libLiFFT/types/View.hpp"
-#include "libLiFFT/types/SliceView.hpp"
+#include "liFFT/types/Vec.hpp"
+#include "liFFT/FFT.hpp"
+#include "liFFT/generateData.hpp"
+#include "liFFT/accessors/TransformAccessor.hpp"
+#include "liFFT/accessors/TransposeAccessor.hpp"
+#include "liFFT/types/SymmetricWrapper.hpp"
+#include "liFFT/accessors/StreamAccessor.hpp"
+#include "liFFT/types/AddDimsWrapper.hpp"
+#include "liFFT/policies/CalcIntensityFunctor.hpp"
+#include "liFFT/types/View.hpp"
+#include "liFFT/types/SliceView.hpp"
 #include <iostream>
 #include <fstream>
 
diff --git a/test/testUtils.hpp b/test/testUtils.hpp
index 392a212..edfeb78 100644
--- a/test/testUtils.hpp
+++ b/test/testUtils.hpp
@@ -17,9 +17,9 @@
 #pragma once
 
 #include "testDefines.hpp"
-#include "libLiFFT/traits/IdentityAccessor.hpp"
-#include "libLiFFT/traits/IsComplex.hpp"
-#include "libLiFFT/policies/Loop.hpp"
+#include "liFFT/traits/IdentityAccessor.hpp"
+#include "liFFT/traits/IsComplex.hpp"
+#include "liFFT/policies/Loop.hpp"
 #include <boost/test/unit_test.hpp>
 #include <cmath>
 #include <iostream>
diff --git a/test/testWrappers.cpp b/test/testWrappers.cpp
index 4ea8281..e9dd397 100644
--- a/test/testWrappers.cpp
+++ b/test/testWrappers.cpp
@@ -15,10 +15,10 @@
  */
 
 #include "testUtils.hpp"
-#include "libLiFFT/FFT.hpp"
-#include "libLiFFT/mem/DataContainer.hpp"
-#include "libLiFFT/types/View.hpp"
-#include "libLiFFT/types/SliceView.hpp"
+#include "liFFT/FFT.hpp"
+#include "liFFT/mem/DataContainer.hpp"
+#include "liFFT/types/View.hpp"
+#include "liFFT/types/SliceView.hpp"
 #include <boost/test/unit_test.hpp>
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/int.hpp>
diff --git a/test/testZip.cpp b/test/testZip.cpp
index 945d267..d51f9b7 100644
--- a/test/testZip.cpp
+++ b/test/testZip.cpp
@@ -15,9 +15,9 @@
  */
  
 #include "testUtils.hpp"
-#include "libLiFFT/accessors/ZipAccessor.hpp"
-#include "libLiFFT/generateData.hpp"
-#include "libLiFFT/FFT.hpp"
+#include "liFFT/accessors/ZipAccessor.hpp"
+#include "liFFT/generateData.hpp"
+#include "liFFT/FFT.hpp"
 #include "tiffWriter/image.hpp"
 #include "tiffWriter/traitsAndPolicies.hpp"
 #include <boost/test/unit_test.hpp>
diff --git a/tiff2Pdf/tiff2pdf.cpp b/tiff2Pdf/tiff2pdf.cpp
index 59c2654..a542fab 100644
--- a/tiff2Pdf/tiff2pdf.cpp
+++ b/tiff2Pdf/tiff2pdf.cpp
@@ -20,10 +20,10 @@
 #include <string>
 #include "tiffWriter/image.hpp"
 #include "tiffWriter/traitsAndPolicies.hpp"
-#include "libLiFFT/traits/IdentityAccessor.hpp"
-#include "libLiFFT/policies/Copy.hpp"
-#include "libLiFFT/types/AddDimsWrapper.hpp"
-#include "libLiFFT/accessors/StreamAccessor.hpp"
+#include "liFFT/traits/IdentityAccessor.hpp"
+#include "liFFT/policies/Copy.hpp"
+#include "liFFT/types/AddDimsWrapper.hpp"
+#include "liFFT/accessors/StreamAccessor.hpp"
 
 std::string
 remove_extension(const std::string& filename) {