diff --git a/exampleMemmap.m b/examples/exampleMemmap.m
similarity index 100%
rename from exampleMemmap.m
rename to examples/exampleMemmap.m
diff --git a/constructNPYheader.m b/npy-matlab/constructNPYheader.m
similarity index 100%
rename from constructNPYheader.m
rename to npy-matlab/constructNPYheader.m
diff --git a/datToNPY.m b/npy-matlab/datToNPY.m
similarity index 100%
rename from datToNPY.m
rename to npy-matlab/datToNPY.m
diff --git a/readNPY.m b/npy-matlab/readNPY.m
similarity index 100%
rename from readNPY.m
rename to npy-matlab/readNPY.m
diff --git a/readNPYheader.m b/npy-matlab/readNPYheader.m
similarity index 100%
rename from readNPYheader.m
rename to npy-matlab/readNPYheader.m
diff --git a/writeNPY.m b/npy-matlab/writeNPY.m
similarity index 100%
rename from writeNPY.m
rename to npy-matlab/writeNPY.m
diff --git a/data/chelsea_float32.npy b/tests/data/chelsea_float32.npy
similarity index 100%
rename from data/chelsea_float32.npy
rename to tests/data/chelsea_float32.npy
diff --git a/data/chelsea_float64.npy b/tests/data/chelsea_float64.npy
similarity index 100%
rename from data/chelsea_float64.npy
rename to tests/data/chelsea_float64.npy
diff --git a/data/chelsea_int16.npy b/tests/data/chelsea_int16.npy
similarity index 100%
rename from data/chelsea_int16.npy
rename to tests/data/chelsea_int16.npy
diff --git a/data/chelsea_int32.npy b/tests/data/chelsea_int32.npy
similarity index 100%
rename from data/chelsea_int32.npy
rename to tests/data/chelsea_int32.npy
diff --git a/data/chelsea_int64.npy b/tests/data/chelsea_int64.npy
similarity index 100%
rename from data/chelsea_int64.npy
rename to tests/data/chelsea_int64.npy
diff --git a/data/chelsea_int8.npy b/tests/data/chelsea_int8.npy
similarity index 100%
rename from data/chelsea_int8.npy
rename to tests/data/chelsea_int8.npy
diff --git a/data/chelsea_uint16.npy b/tests/data/chelsea_uint16.npy
similarity index 100%
rename from data/chelsea_uint16.npy
rename to tests/data/chelsea_uint16.npy
diff --git a/data/chelsea_uint32.npy b/tests/data/chelsea_uint32.npy
similarity index 100%
rename from data/chelsea_uint32.npy
rename to tests/data/chelsea_uint32.npy
diff --git a/data/chelsea_uint64.npy b/tests/data/chelsea_uint64.npy
similarity index 100%
rename from data/chelsea_uint64.npy
rename to tests/data/chelsea_uint64.npy
diff --git a/data/chelsea_uint8.npy b/tests/data/chelsea_uint8.npy
similarity index 100%
rename from data/chelsea_uint8.npy
rename to tests/data/chelsea_uint8.npy
diff --git a/data/matlab_chelsea_float32.npy b/tests/data/matlab_chelsea_float32.npy
similarity index 100%
rename from data/matlab_chelsea_float32.npy
rename to tests/data/matlab_chelsea_float32.npy
diff --git a/data/matlab_chelsea_float64.npy b/tests/data/matlab_chelsea_float64.npy
similarity index 100%
rename from data/matlab_chelsea_float64.npy
rename to tests/data/matlab_chelsea_float64.npy
diff --git a/data/matlab_chelsea_int16.npy b/tests/data/matlab_chelsea_int16.npy
similarity index 100%
rename from data/matlab_chelsea_int16.npy
rename to tests/data/matlab_chelsea_int16.npy
diff --git a/data/matlab_chelsea_int32.npy b/tests/data/matlab_chelsea_int32.npy
similarity index 100%
rename from data/matlab_chelsea_int32.npy
rename to tests/data/matlab_chelsea_int32.npy
diff --git a/data/matlab_chelsea_int64.npy b/tests/data/matlab_chelsea_int64.npy
similarity index 100%
rename from data/matlab_chelsea_int64.npy
rename to tests/data/matlab_chelsea_int64.npy
diff --git a/data/matlab_chelsea_int8.npy b/tests/data/matlab_chelsea_int8.npy
similarity index 100%
rename from data/matlab_chelsea_int8.npy
rename to tests/data/matlab_chelsea_int8.npy
diff --git a/data/matlab_chelsea_uint16.npy b/tests/data/matlab_chelsea_uint16.npy
similarity index 100%
rename from data/matlab_chelsea_uint16.npy
rename to tests/data/matlab_chelsea_uint16.npy
diff --git a/data/matlab_chelsea_uint32.npy b/tests/data/matlab_chelsea_uint32.npy
similarity index 100%
rename from data/matlab_chelsea_uint32.npy
rename to tests/data/matlab_chelsea_uint32.npy
diff --git a/data/matlab_chelsea_uint64.npy b/tests/data/matlab_chelsea_uint64.npy
similarity index 100%
rename from data/matlab_chelsea_uint64.npy
rename to tests/data/matlab_chelsea_uint64.npy
diff --git a/data/matlab_chelsea_uint8.npy b/tests/data/matlab_chelsea_uint8.npy
similarity index 100%
rename from data/matlab_chelsea_uint8.npy
rename to tests/data/matlab_chelsea_uint8.npy
diff --git a/data/matlab_sine_float32.npy b/tests/data/matlab_sine_float32.npy
similarity index 100%
rename from data/matlab_sine_float32.npy
rename to tests/data/matlab_sine_float32.npy
diff --git a/data/matlab_sine_float64.npy b/tests/data/matlab_sine_float64.npy
similarity index 100%
rename from data/matlab_sine_float64.npy
rename to tests/data/matlab_sine_float64.npy
diff --git a/data/matlab_sine_int16.npy b/tests/data/matlab_sine_int16.npy
similarity index 100%
rename from data/matlab_sine_int16.npy
rename to tests/data/matlab_sine_int16.npy
diff --git a/data/matlab_sine_int32.npy b/tests/data/matlab_sine_int32.npy
similarity index 100%
rename from data/matlab_sine_int32.npy
rename to tests/data/matlab_sine_int32.npy
diff --git a/data/matlab_sine_int64.npy b/tests/data/matlab_sine_int64.npy
similarity index 100%
rename from data/matlab_sine_int64.npy
rename to tests/data/matlab_sine_int64.npy
diff --git a/data/matlab_sine_int8.npy b/tests/data/matlab_sine_int8.npy
similarity index 100%
rename from data/matlab_sine_int8.npy
rename to tests/data/matlab_sine_int8.npy
diff --git a/data/matlab_sine_uint16.npy b/tests/data/matlab_sine_uint16.npy
similarity index 100%
rename from data/matlab_sine_uint16.npy
rename to tests/data/matlab_sine_uint16.npy
diff --git a/data/matlab_sine_uint32.npy b/tests/data/matlab_sine_uint32.npy
similarity index 100%
rename from data/matlab_sine_uint32.npy
rename to tests/data/matlab_sine_uint32.npy
diff --git a/data/matlab_sine_uint64.npy b/tests/data/matlab_sine_uint64.npy
similarity index 100%
rename from data/matlab_sine_uint64.npy
rename to tests/data/matlab_sine_uint64.npy
diff --git a/data/matlab_sine_uint8.npy b/tests/data/matlab_sine_uint8.npy
similarity index 100%
rename from data/matlab_sine_uint8.npy
rename to tests/data/matlab_sine_uint8.npy
diff --git a/data/sine_float32.npy b/tests/data/sine_float32.npy
similarity index 100%
rename from data/sine_float32.npy
rename to tests/data/sine_float32.npy
diff --git a/data/sine_float64.npy b/tests/data/sine_float64.npy
similarity index 100%
rename from data/sine_float64.npy
rename to tests/data/sine_float64.npy
diff --git a/data/sine_int16.npy b/tests/data/sine_int16.npy
similarity index 100%
rename from data/sine_int16.npy
rename to tests/data/sine_int16.npy
diff --git a/data/sine_int32.npy b/tests/data/sine_int32.npy
similarity index 100%
rename from data/sine_int32.npy
rename to tests/data/sine_int32.npy
diff --git a/data/sine_int64.npy b/tests/data/sine_int64.npy
similarity index 100%
rename from data/sine_int64.npy
rename to tests/data/sine_int64.npy
diff --git a/data/sine_int8.npy b/tests/data/sine_int8.npy
similarity index 100%
rename from data/sine_int8.npy
rename to tests/data/sine_int8.npy
diff --git a/data/sine_uint16.npy b/tests/data/sine_uint16.npy
similarity index 100%
rename from data/sine_uint16.npy
rename to tests/data/sine_uint16.npy
diff --git a/data/sine_uint32.npy b/tests/data/sine_uint32.npy
similarity index 100%
rename from data/sine_uint32.npy
rename to tests/data/sine_uint32.npy
diff --git a/data/sine_uint64.npy b/tests/data/sine_uint64.npy
similarity index 100%
rename from data/sine_uint64.npy
rename to tests/data/sine_uint64.npy
diff --git a/data/sine_uint8.npy b/tests/data/sine_uint8.npy
similarity index 100%
rename from data/sine_uint8.npy
rename to tests/data/sine_uint8.npy
diff --git a/data/test.npy b/tests/data/test.npy
similarity index 100%
rename from data/test.npy
rename to tests/data/test.npy
diff --git a/npy.ipynb b/tests/npy.ipynb
similarity index 100%
rename from npy.ipynb
rename to tests/npy.ipynb
diff --git a/test_readNPY.m b/tests/test_readNPY.m
similarity index 100%
rename from test_readNPY.m
rename to tests/test_readNPY.m