diff --git a/external/catch2/catch.hpp b/src/catch2/catch.hpp
similarity index 100%
rename from external/catch2/catch.hpp
rename to src/catch2/catch.hpp
diff --git a/external/catch2/catch_reporter_automake.hpp b/src/catch2/catch_reporter_automake.hpp
similarity index 100%
rename from external/catch2/catch_reporter_automake.hpp
rename to src/catch2/catch_reporter_automake.hpp
diff --git a/external/catch2/catch_reporter_tap.hpp b/src/catch2/catch_reporter_tap.hpp
similarity index 100%
rename from external/catch2/catch_reporter_tap.hpp
rename to src/catch2/catch_reporter_tap.hpp
diff --git a/external/catch2/catch_reporter_teamcity.hpp b/src/catch2/catch_reporter_teamcity.hpp
similarity index 100%
rename from external/catch2/catch_reporter_teamcity.hpp
rename to src/catch2/catch_reporter_teamcity.hpp
diff --git a/external/ghc/filesystem.hpp b/src/external/ghc/filesystem.hpp
similarity index 100%
rename from external/ghc/filesystem.hpp
rename to src/external/ghc/filesystem.hpp
diff --git a/external/ghc/fs_fwd.hpp b/src/external/ghc/fs_fwd.hpp
similarity index 100%
rename from external/ghc/fs_fwd.hpp
rename to src/external/ghc/fs_fwd.hpp
diff --git a/external/ghc/fs_impl.hpp b/src/external/ghc/fs_impl.hpp
similarity index 100%
rename from external/ghc/fs_impl.hpp
rename to src/external/ghc/fs_impl.hpp
diff --git a/external/ghc/fs_std.hpp b/src/external/ghc/fs_std.hpp
similarity index 100%
rename from external/ghc/fs_std.hpp
rename to src/external/ghc/fs_std.hpp
diff --git a/external/ghc/fs_std_fwd.hpp b/src/external/ghc/fs_std_fwd.hpp
similarity index 100%
rename from external/ghc/fs_std_fwd.hpp
rename to src/external/ghc/fs_std_fwd.hpp
diff --git a/external/ghc/fs_std_impl.hpp b/src/external/ghc/fs_std_impl.hpp
similarity index 100%
rename from external/ghc/fs_std_impl.hpp
rename to src/external/ghc/fs_std_impl.hpp
diff --git a/external/mathfuns/neon_mathfun.h b/src/external/mathfuns/neon_mathfun.h
similarity index 100%
rename from external/mathfuns/neon_mathfun.h
rename to src/external/mathfuns/neon_mathfun.h
diff --git a/external/mathfuns/sse_mathfun.h b/src/external/mathfuns/sse_mathfun.h
similarity index 100%
rename from external/mathfuns/sse_mathfun.h
rename to src/external/mathfuns/sse_mathfun.h
diff --git a/external/readerwriterqueue/atomicops.h b/src/external/readerwriterqueue/atomicops.h
similarity index 100%
rename from external/readerwriterqueue/atomicops.h
rename to src/external/readerwriterqueue/atomicops.h
diff --git a/external/readerwriterqueue/readerwriterqueue.h b/src/external/readerwriterqueue/readerwriterqueue.h
similarity index 100%
rename from external/readerwriterqueue/readerwriterqueue.h
rename to src/external/readerwriterqueue/readerwriterqueue.h
diff --git a/external/cnpy/cnpy.cpp b/tests/cnpy/cnpy.cpp
similarity index 100%
rename from external/cnpy/cnpy.cpp
rename to tests/cnpy/cnpy.cpp
diff --git a/external/cnpy/cnpy.h b/tests/cnpy/cnpy.h
similarity index 100%
rename from external/cnpy/cnpy.h
rename to tests/cnpy/cnpy.h