diff --git a/test/list/datatype/foldable/foldl.cpp b/test/list/instance/foldable/foldl.cpp
similarity index 100%
rename from test/list/datatype/foldable/foldl.cpp
rename to test/list/instance/foldable/foldl.cpp
diff --git a/test/list/datatype/foldable/foldr.cpp b/test/list/instance/foldable/foldr.cpp
similarity index 100%
rename from test/list/datatype/foldable/foldr.cpp
rename to test/list/instance/foldable/foldr.cpp
diff --git a/test/list/datatype/foldable/length.cpp b/test/list/instance/foldable/length.cpp
similarity index 100%
rename from test/list/datatype/foldable/length.cpp
rename to test/list/instance/foldable/length.cpp
diff --git a/test/list/datatype/foldable/unpack.cpp b/test/list/instance/foldable/unpack.cpp
similarity index 100%
rename from test/list/datatype/foldable/unpack.cpp
rename to test/list/instance/foldable/unpack.cpp
diff --git a/test/list/datatype/functor/fmap.cpp b/test/list/instance/functor/fmap.cpp
similarity index 100%
rename from test/list/datatype/functor/fmap.cpp
rename to test/list/instance/functor/fmap.cpp
diff --git a/test/list/datatype/functor/laws.cpp b/test/list/instance/functor/laws.cpp
similarity index 100%
rename from test/list/datatype/functor/laws.cpp
rename to test/list/instance/functor/laws.cpp
diff --git a/test/list/datatype/iterable/at.cpp b/test/list/instance/iterable/at.cpp
similarity index 100%
rename from test/list/datatype/iterable/at.cpp
rename to test/list/instance/iterable/at.cpp
diff --git a/test/list/datatype/iterable/head.cpp b/test/list/instance/iterable/head.cpp
similarity index 100%
rename from test/list/datatype/iterable/head.cpp
rename to test/list/instance/iterable/head.cpp
diff --git a/test/list/datatype/iterable/is_empty.cpp b/test/list/instance/iterable/is_empty.cpp
similarity index 100%
rename from test/list/datatype/iterable/is_empty.cpp
rename to test/list/instance/iterable/is_empty.cpp
diff --git a/test/list/datatype/iterable/tail.cpp b/test/list/instance/iterable/tail.cpp
similarity index 100%
rename from test/list/datatype/iterable/tail.cpp
rename to test/list/instance/iterable/tail.cpp
diff --git a/test/list/datatype/list/concat.cpp b/test/list/instance/list/concat.cpp
similarity index 100%
rename from test/list/datatype/list/concat.cpp
rename to test/list/instance/list/concat.cpp
diff --git a/test/list/datatype/list/cons.cpp b/test/list/instance/list/cons.cpp
similarity index 100%
rename from test/list/datatype/list/cons.cpp
rename to test/list/instance/list/cons.cpp
diff --git a/test/list/datatype/list/init.cpp b/test/list/instance/list/init.cpp
similarity index 100%
rename from test/list/datatype/list/init.cpp
rename to test/list/instance/list/init.cpp
diff --git a/test/list/datatype/list/nil.cpp b/test/list/instance/list/nil.cpp
similarity index 100%
rename from test/list/datatype/list/nil.cpp
rename to test/list/instance/list/nil.cpp
diff --git a/test/list/datatype/list/snoc.cpp b/test/list/instance/list/snoc.cpp
similarity index 100%
rename from test/list/datatype/list/snoc.cpp
rename to test/list/instance/list/snoc.cpp
diff --git a/test/list/datatype/list/take.cpp b/test/list/instance/list/take.cpp
similarity index 100%
rename from test/list/datatype/list/take.cpp
rename to test/list/instance/list/take.cpp
diff --git a/test/list/datatype/list/zip_with.cpp b/test/list/instance/list/zip_with.cpp
similarity index 100%
rename from test/list/datatype/list/zip_with.cpp
rename to test/list/instance/list/zip_with.cpp