diff --git a/lib/arrayfire.lua b/wrapper/arrayfire/arrayfire.lua
similarity index 100%
rename from lib/arrayfire.lua
rename to wrapper/arrayfire/arrayfire.lua
diff --git a/lib/funcs/gfor.lua b/wrapper/arrayfire/funcs/gfor.lua
similarity index 100%
rename from lib/funcs/gfor.lua
rename to wrapper/arrayfire/funcs/gfor.lua
diff --git a/lib/funcs/image.lua b/wrapper/arrayfire/funcs/image.lua
similarity index 100%
rename from lib/funcs/image.lua
rename to wrapper/arrayfire/funcs/image.lua
diff --git a/lib/funcs/io.lua b/wrapper/arrayfire/funcs/io.lua
similarity index 100%
rename from lib/funcs/io.lua
rename to wrapper/arrayfire/funcs/io.lua
diff --git a/lib/funcs/linear_algebra.lua b/wrapper/arrayfire/funcs/linear_algebra.lua
similarity index 100%
rename from lib/funcs/linear_algebra.lua
rename to wrapper/arrayfire/funcs/linear_algebra.lua
diff --git a/lib/funcs/mathematics.lua b/wrapper/arrayfire/funcs/mathematics.lua
similarity index 100%
rename from lib/funcs/mathematics.lua
rename to wrapper/arrayfire/funcs/mathematics.lua
diff --git a/lib/funcs/signal_processing.lua b/wrapper/arrayfire/funcs/signal_processing.lua
similarity index 100%
rename from lib/funcs/signal_processing.lua
rename to wrapper/arrayfire/funcs/signal_processing.lua
diff --git a/lib/funcs/static.lua b/wrapper/arrayfire/funcs/static.lua
similarity index 100%
rename from lib/funcs/static.lua
rename to wrapper/arrayfire/funcs/static.lua
diff --git a/lib/funcs/statistics.lua b/wrapper/arrayfire/funcs/statistics.lua
similarity index 100%
rename from lib/funcs/statistics.lua
rename to wrapper/arrayfire/funcs/statistics.lua
diff --git a/lib/funcs/util.lua b/wrapper/arrayfire/funcs/util.lua
similarity index 100%
rename from lib/funcs/util.lua
rename to wrapper/arrayfire/funcs/util.lua
diff --git a/lib/funcs/vector.lua b/wrapper/arrayfire/funcs/vector.lua
similarity index 100%
rename from lib/funcs/vector.lua
rename to wrapper/arrayfire/funcs/vector.lua
diff --git a/lib/graphics/window.lua b/wrapper/arrayfire/graphics/window.lua
similarity index 100%
rename from lib/graphics/window.lua
rename to wrapper/arrayfire/graphics/window.lua
diff --git a/lib/impl/array.lua b/wrapper/arrayfire/impl/array.lua
similarity index 100%
rename from lib/impl/array.lua
rename to wrapper/arrayfire/impl/array.lua
diff --git a/lib/impl/ephemeral.lua b/wrapper/arrayfire/impl/ephemeral.lua
similarity index 100%
rename from lib/impl/ephemeral.lua
rename to wrapper/arrayfire/impl/ephemeral.lua
diff --git a/lib/impl/index.lua b/wrapper/arrayfire/impl/index.lua
similarity index 100%
rename from lib/impl/index.lua
rename to wrapper/arrayfire/impl/index.lua
diff --git a/lib/impl/operators.lua b/wrapper/arrayfire/impl/operators.lua
similarity index 100%
rename from lib/impl/operators.lua
rename to wrapper/arrayfire/impl/operators.lua
diff --git a/lib/impl/seq.lua b/wrapper/arrayfire/impl/seq.lua
similarity index 100%
rename from lib/impl/seq.lua
rename to wrapper/arrayfire/impl/seq.lua
diff --git a/lib/methods/constructors.lua b/wrapper/arrayfire/methods/constructors.lua
similarity index 100%
rename from lib/methods/constructors.lua
rename to wrapper/arrayfire/methods/constructors.lua
diff --git a/lib/methods/device.lua b/wrapper/arrayfire/methods/device.lua
similarity index 100%
rename from lib/methods/device.lua
rename to wrapper/arrayfire/methods/device.lua
diff --git a/lib/methods/methods.lua b/wrapper/arrayfire/methods/methods.lua
similarity index 100%
rename from lib/methods/methods.lua
rename to wrapper/arrayfire/methods/methods.lua
diff --git a/lib/methods/move_reorder.lua b/wrapper/arrayfire/methods/move_reorder.lua
similarity index 100%
rename from lib/methods/move_reorder.lua
rename to wrapper/arrayfire/methods/move_reorder.lua
diff --git a/lib/misc/env_loop.lua b/wrapper/arrayfire/misc/env_loop.lua
similarity index 100%
rename from lib/misc/env_loop.lua
rename to wrapper/arrayfire/misc/env_loop.lua
diff --git a/lib/misc/imports.lua b/wrapper/arrayfire/misc/imports.lua
similarity index 100%
rename from lib/misc/imports.lua
rename to wrapper/arrayfire/misc/imports.lua
diff --git a/lib/misc/program.lua b/wrapper/arrayfire/misc/program.lua
similarity index 100%
rename from lib/misc/program.lua
rename to wrapper/arrayfire/misc/program.lua