diff --git a/data/Matrices/bp___200.mtx b/data/MatrixMarket/bp___200.mtx
similarity index 100%
rename from data/Matrices/bp___200.mtx
rename to data/MatrixMarket/bp___200.mtx
diff --git a/data/Matrices/can24_pattern_symmetric_coordinate_24.mtx b/data/MatrixMarket/can24_pattern_symmetric_coordinate_24.mtx
similarity index 100%
rename from data/Matrices/can24_pattern_symmetric_coordinate_24.mtx
rename to data/MatrixMarket/can24_pattern_symmetric_coordinate_24.mtx
diff --git a/data/Matrices/gear_integer_general_coordinate_100.mtx b/data/MatrixMarket/gear_integer_general_coordinate_100.mtx
similarity index 100%
rename from data/Matrices/gear_integer_general_coordinate_100.mtx
rename to data/MatrixMarket/gear_integer_general_coordinate_100.mtx
diff --git a/data/Matrices/hilbert_real_symmetric_array_10.mtx b/data/MatrixMarket/hilbert_real_symmetric_array_10.mtx
similarity index 100%
rename from data/Matrices/hilbert_real_symmetric_array_10.mtx
rename to data/MatrixMarket/hilbert_real_symmetric_array_10.mtx
diff --git a/data/Matrices/random_real_general_array_100.mtx b/data/MatrixMarket/random_real_general_array_100.mtx
similarity index 100%
rename from data/Matrices/random_real_general_array_100.mtx
rename to data/MatrixMarket/random_real_general_array_100.mtx
diff --git a/data/Matrices/random_real_general_array_10_20.mtx b/data/MatrixMarket/random_real_general_array_10_20.mtx
similarity index 100%
rename from data/Matrices/random_real_general_array_10_20.mtx
rename to data/MatrixMarket/random_real_general_array_10_20.mtx
diff --git a/data/Matrices/random_real_general_array_20_10.mtx b/data/MatrixMarket/random_real_general_array_20_10.mtx
similarity index 100%
rename from data/Matrices/random_real_general_array_20_10.mtx
rename to data/MatrixMarket/random_real_general_array_20_10.mtx
diff --git a/data/Matrices/random_real_general_coordinate_10_20.mtx b/data/MatrixMarket/random_real_general_coordinate_10_20.mtx
similarity index 100%
rename from data/Matrices/random_real_general_coordinate_10_20.mtx
rename to data/MatrixMarket/random_real_general_coordinate_10_20.mtx
diff --git a/data/Matrices/random_real_general_dense_10_20.comma b/data/MatrixMarket/random_real_general_dense_10_20.comma
similarity index 100%
rename from data/Matrices/random_real_general_dense_10_20.comma
rename to data/MatrixMarket/random_real_general_dense_10_20.comma
diff --git a/data/Matrices/random_real_general_dense_10_20.space b/data/MatrixMarket/random_real_general_dense_10_20.space
similarity index 100%
rename from data/Matrices/random_real_general_dense_10_20.space
rename to data/MatrixMarket/random_real_general_dense_10_20.space
diff --git a/data/Matrices/random_real_general_dense_10_20.tab b/data/MatrixMarket/random_real_general_dense_10_20.tab
similarity index 100%
rename from data/Matrices/random_real_general_dense_10_20.tab
rename to data/MatrixMarket/random_real_general_dense_10_20.tab
diff --git a/src/TestData/TestData.csproj b/src/TestData/TestData.csproj
index 30367a46..9f2a9762 100644
--- a/src/TestData/TestData.csproj
+++ b/src/TestData/TestData.csproj
@@ -75,209 +75,240 @@
Data\Github-Cureos-1.csv
-
+
Data\Matlab\A.mat
-
+
Data\Matlab\collection-nocompress.mat
-
+
Data\Matlab\collection.mat
-
+
Data\Matlab\complex.mat
-
+
Data\Matlab\sparse-large.mat
-
+
Data\Matlab\sparse-small.mat
-
+
Data\Matlab\sparse_complex.mat
-
+
Data\Matlab\v.mat
-
+
Data\NIST\AtmWtAgt.dat
-
+
Data\NIST\Bennett5.dat
-
+
Data\NIST\BoxBOD.dat
-
+
Data\NIST\Chwirut1.dat
-
+
Data\NIST\Chwirut2.dat
-
+
Data\NIST\DanWood.dat
-
+
Data\NIST\Eckerle4.dat
-
+
Data\NIST\ENSO.dat
-
+
Data\NIST\Filip.dat
-
+
Data\NIST\Gauss1.dat
-
+
Data\NIST\Gauss2.dat
-
+
Data\NIST\Gauss3.dat
-
+
Data\NIST\Hahn1.dat
-
+
Data\NIST\Kirby2.dat
-
+
Data\NIST\Lanczos1.dat
-
+
Data\NIST\Lanczos2.dat
-
+
Data\NIST\Lanczos3.dat
-
+
Data\NIST\Lew.dat
-
+
Data\NIST\Longley.dat
-
+
Data\NIST\Lottery.dat
-
+
Data\NIST\Mavro.dat
-
+
Data\NIST\Meixner.dat
-
+
Data\NIST\MGH09.dat
-
+
Data\NIST\MGH10.dat
-
+
Data\NIST\MGH17.dat
-
+
Data\NIST\Michelso.dat
-
+
Data\NIST\Misra1a.dat
-
+
Data\NIST\Misra1b.dat
-
+
Data\NIST\Misra1c.dat
-
+
Data\NIST\Misra1d.dat
-
+
Data\NIST\Nelson.dat
-
+
Data\NIST\NoInt1.dat
-
+
Data\NIST\NoInt2.dat
-
+
Data\NIST\Norris.dat
-
+
Data\NIST\NumAcc1.dat
-
+
Data\NIST\NumAcc2.dat
-
+
Data\NIST\NumAcc3.dat
-
+
Data\NIST\NumAcc4.dat
-
+
Data\NIST\Pontius.dat
-
+
Data\NIST\Rat42.dat
-
+
Data\NIST\Rat43.dat
-
+
Data\NIST\Roszman1.dat
-
+
Data\NIST\SiRstvt.dat
-
+
Data\NIST\SmLs01t.dat
-
+
Data\NIST\SmLs02t.dat
-
+
Data\NIST\SmLs03t.dat
-
+
Data\NIST\SmLs04t.dat
-
+
Data\NIST\SmLs05t.dat
-
+
Data\NIST\SmLs06t.dat
-
+
Data\NIST\SmLs07t.dat
-
+
Data\NIST\SmLs08t.dat
-
+
Data\NIST\SmLs09t.dat
-
+
Data\NIST\Thurber.dat
-
+
Data\NIST\Wampler1.dat
-
+
Data\NIST\Wampler2.dat
-
+
Data\NIST\Wampler3.dat
-
+
Data\NIST\Wampler4.dat
-
+
Data\NIST\Wampler5.dat
-
-
Data\MatrixMarket\fidap007.mtx
+
+ Data\MatrixMarket\bp___200.mtx
+
+
+ Data\MatrixMarket\can24_pattern_symmetric_coordinate_24.mtx
+
+
+ Data\MatrixMarket\gear_integer_general_coordinate_100.mtx
+
+
+ Data\MatrixMarket\hilbert_real_symmetric_array_10.mtx
+
+
+ Data\MatrixMarket\random_real_general_array_100.mtx
+
+
+ Data\MatrixMarket\random_real_general_array_10_20.mtx
+
+
+ Data\MatrixMarket\random_real_general_array_20_10.mtx
+
+
+ Data\MatrixMarket\random_real_general_coordinate_10_20.mtx
+
+
+ Data\MatrixMarket\random_real_general_dense_10_20.comma
+
+
+ Data\MatrixMarket\random_real_general_dense_10_20.space
+
+
+ Data\MatrixMarket\random_real_general_dense_10_20.tab
+