diff --git a/wrapper/Lua/arrayfire/CMakeLists.txt b/wrapper/Lua/CMakeLists.txt
similarity index 100%
rename from wrapper/Lua/arrayfire/CMakeLists.txt
rename to wrapper/Lua/CMakeLists.txt
diff --git a/wrapper/Lua/arrayfire/ReadMe.txt b/wrapper/Lua/ReadMe.txt
similarity index 100%
rename from wrapper/Lua/arrayfire/ReadMe.txt
rename to wrapper/Lua/ReadMe.txt
diff --git a/wrapper/Lua/arrayfire/args.cpp b/wrapper/Lua/args.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/args.cpp
rename to wrapper/Lua/args.cpp
diff --git a/wrapper/Lua/arrayfire/arrayfire.cpp b/wrapper/Lua/arrayfire.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/arrayfire.cpp
rename to wrapper/Lua/arrayfire.cpp
diff --git a/wrapper/Lua/arrayfire/arrayfire.vcxproj b/wrapper/Lua/arrayfire.vcxproj
similarity index 100%
rename from wrapper/Lua/arrayfire/arrayfire.vcxproj
rename to wrapper/Lua/arrayfire.vcxproj
diff --git a/wrapper/Lua/arrayfire/arrayfire.vcxproj.filters b/wrapper/Lua/arrayfire.vcxproj.filters
similarity index 100%
rename from wrapper/Lua/arrayfire/arrayfire.vcxproj.filters
rename to wrapper/Lua/arrayfire.vcxproj.filters
diff --git a/wrapper/Lua/arrayfire/export.h b/wrapper/Lua/export.h
similarity index 100%
rename from wrapper/Lua/arrayfire/export.h
rename to wrapper/Lua/export.h
diff --git a/wrapper/Lua/arrayfire/funcs.h b/wrapper/Lua/funcs.h
similarity index 100%
rename from wrapper/Lua/arrayfire/funcs.h
rename to wrapper/Lua/funcs.h
diff --git a/wrapper/Lua/arrayfire/funcs/AddEnums.cpp b/wrapper/Lua/funcs/AddEnums.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/funcs/AddEnums.cpp
rename to wrapper/Lua/funcs/AddEnums.cpp
diff --git a/wrapper/Lua/arrayfire/funcs/Backends.cpp b/wrapper/Lua/funcs/Backends.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/funcs/Backends.cpp
rename to wrapper/Lua/funcs/Backends.cpp
diff --git a/wrapper/Lua/arrayfire/funcs/ComputerVision.cpp b/wrapper/Lua/funcs/ComputerVision.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/funcs/ComputerVision.cpp
rename to wrapper/Lua/funcs/ComputerVision.cpp
diff --git a/wrapper/Lua/arrayfire/funcs/IO.cpp b/wrapper/Lua/funcs/IO.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/funcs/IO.cpp
rename to wrapper/Lua/funcs/IO.cpp
diff --git a/wrapper/Lua/arrayfire/funcs/ImageProcessing.cpp b/wrapper/Lua/funcs/ImageProcessing.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/funcs/ImageProcessing.cpp
rename to wrapper/Lua/funcs/ImageProcessing.cpp
diff --git a/wrapper/Lua/arrayfire/funcs/Interface.cpp b/wrapper/Lua/funcs/Interface.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/funcs/Interface.cpp
rename to wrapper/Lua/funcs/Interface.cpp
diff --git a/wrapper/Lua/arrayfire/funcs/LinearAlgebra.cpp b/wrapper/Lua/funcs/LinearAlgebra.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/funcs/LinearAlgebra.cpp
rename to wrapper/Lua/funcs/LinearAlgebra.cpp
diff --git a/wrapper/Lua/arrayfire/funcs/Mathematics.cpp b/wrapper/Lua/funcs/Mathematics.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/funcs/Mathematics.cpp
rename to wrapper/Lua/funcs/Mathematics.cpp
diff --git a/wrapper/Lua/arrayfire/funcs/SignalProcessing.cpp b/wrapper/Lua/funcs/SignalProcessing.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/funcs/SignalProcessing.cpp
rename to wrapper/Lua/funcs/SignalProcessing.cpp
diff --git a/wrapper/Lua/arrayfire/funcs/Statistics.cpp b/wrapper/Lua/funcs/Statistics.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/funcs/Statistics.cpp
rename to wrapper/Lua/funcs/Statistics.cpp
diff --git a/wrapper/Lua/arrayfire/funcs/Util.cpp b/wrapper/Lua/funcs/Util.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/funcs/Util.cpp
rename to wrapper/Lua/funcs/Util.cpp
diff --git a/wrapper/Lua/arrayfire/funcs/Vector.cpp b/wrapper/Lua/funcs/Vector.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/funcs/Vector.cpp
rename to wrapper/Lua/funcs/Vector.cpp
diff --git a/wrapper/Lua/arrayfire/graphics.h b/wrapper/Lua/graphics.h
similarity index 100%
rename from wrapper/Lua/arrayfire/graphics.h
rename to wrapper/Lua/graphics.h
diff --git a/wrapper/Lua/arrayfire/graphics/Draw.cpp b/wrapper/Lua/graphics/Draw.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/graphics/Draw.cpp
rename to wrapper/Lua/graphics/Draw.cpp
diff --git a/wrapper/Lua/arrayfire/graphics/Window.cpp b/wrapper/Lua/graphics/Window.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/graphics/Window.cpp
rename to wrapper/Lua/graphics/Window.cpp
diff --git a/wrapper/Lua/arrayfire/lua_compat.h b/wrapper/Lua/lua_compat.h
similarity index 100%
rename from wrapper/Lua/arrayfire/lua_compat.h
rename to wrapper/Lua/lua_compat.h
diff --git a/wrapper/Lua/arrayfire/methods.h b/wrapper/Lua/methods.h
similarity index 100%
rename from wrapper/Lua/arrayfire/methods.h
rename to wrapper/Lua/methods.h
diff --git a/wrapper/Lua/arrayfire/methods/AssignIndex.cpp b/wrapper/Lua/methods/AssignIndex.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/methods/AssignIndex.cpp
rename to wrapper/Lua/methods/AssignIndex.cpp
diff --git a/wrapper/Lua/arrayfire/methods/Constructor.cpp b/wrapper/Lua/methods/Constructor.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/methods/Constructor.cpp
rename to wrapper/Lua/methods/Constructor.cpp
diff --git a/wrapper/Lua/arrayfire/methods/Create.cpp b/wrapper/Lua/methods/Create.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/methods/Create.cpp
rename to wrapper/Lua/methods/Create.cpp
diff --git a/wrapper/Lua/arrayfire/methods/Device.cpp b/wrapper/Lua/methods/Device.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/methods/Device.cpp
rename to wrapper/Lua/methods/Device.cpp
diff --git a/wrapper/Lua/arrayfire/methods/Features.cpp b/wrapper/Lua/methods/Features.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/methods/Features.cpp
rename to wrapper/Lua/methods/Features.cpp
diff --git a/wrapper/Lua/arrayfire/methods/Helper.cpp b/wrapper/Lua/methods/Helper.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/methods/Helper.cpp
rename to wrapper/Lua/methods/Helper.cpp
diff --git a/wrapper/Lua/arrayfire/methods/Methods.cpp b/wrapper/Lua/methods/Methods.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/methods/Methods.cpp
rename to wrapper/Lua/methods/Methods.cpp
diff --git a/wrapper/Lua/arrayfire/methods/MoveReorder.cpp b/wrapper/Lua/methods/MoveReorder.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/methods/MoveReorder.cpp
rename to wrapper/Lua/methods/MoveReorder.cpp
diff --git a/wrapper/Lua/arrayfire/template/args.h b/wrapper/Lua/template/args.h
similarity index 100%
rename from wrapper/Lua/arrayfire/template/args.h
rename to wrapper/Lua/template/args.h
diff --git a/wrapper/Lua/arrayfire/template/doubles.h b/wrapper/Lua/template/doubles.h
similarity index 100%
rename from wrapper/Lua/arrayfire/template/doubles.h
rename to wrapper/Lua/template/doubles.h
diff --git a/wrapper/Lua/arrayfire/template/from.h b/wrapper/Lua/template/from.h
similarity index 100%
rename from wrapper/Lua/arrayfire/template/from.h
rename to wrapper/Lua/template/from.h
diff --git a/wrapper/Lua/arrayfire/template/in.h b/wrapper/Lua/template/in.h
similarity index 100%
rename from wrapper/Lua/arrayfire/template/in.h
rename to wrapper/Lua/template/in.h
diff --git a/wrapper/Lua/arrayfire/template/out.h b/wrapper/Lua/template/out.h
similarity index 100%
rename from wrapper/Lua/arrayfire/template/out.h
rename to wrapper/Lua/template/out.h
diff --git a/wrapper/Lua/arrayfire/template/out2_in.h b/wrapper/Lua/template/out2_in.h
similarity index 100%
rename from wrapper/Lua/arrayfire/template/out2_in.h
rename to wrapper/Lua/template/out2_in.h
diff --git a/wrapper/Lua/arrayfire/template/out2_in2.h b/wrapper/Lua/template/out2_in2.h
similarity index 100%
rename from wrapper/Lua/arrayfire/template/out2_in2.h
rename to wrapper/Lua/template/out2_in2.h
diff --git a/wrapper/Lua/arrayfire/template/out_in.h b/wrapper/Lua/template/out_in.h
similarity index 100%
rename from wrapper/Lua/arrayfire/template/out_in.h
rename to wrapper/Lua/template/out_in.h
diff --git a/wrapper/Lua/arrayfire/template/out_in2.h b/wrapper/Lua/template/out_in2.h
similarity index 100%
rename from wrapper/Lua/arrayfire/template/out_in2.h
rename to wrapper/Lua/template/out_in2.h
diff --git a/wrapper/Lua/arrayfire/template/out_in3.h b/wrapper/Lua/template/out_in3.h
similarity index 100%
rename from wrapper/Lua/arrayfire/template/out_in3.h
rename to wrapper/Lua/template/out_in3.h
diff --git a/wrapper/Lua/arrayfire/utils.cpp b/wrapper/Lua/utils.cpp
similarity index 100%
rename from wrapper/Lua/arrayfire/utils.cpp
rename to wrapper/Lua/utils.cpp
diff --git a/wrapper/Lua/arrayfire/utils.h b/wrapper/Lua/utils.h
similarity index 100%
rename from wrapper/Lua/arrayfire/utils.h
rename to wrapper/Lua/utils.h