 package flare.tests
 {
-	import flare.util.matrix.DenseMatrix;
-	import flare.util.matrix.IMatrix;
-	import flare.util.matrix.SparseMatrix;
+	import flare.util.math.DenseMatrix;
+	import flare.util.math.IMatrix;
+	import flare.util.math.SparseMatrix;
 	
 	import unitest.TestCase;
 

		
		private static function testMatrix(mat:IMatrix):void
		{
			var i:int, j:int, c:int = 7;
			
			// populate matrix
			for (i=0; i<mat.cols; ++i) mat.$(1,i,c);
			for (i=0; i<mat.rows; ++i) mat.$(i,1,c);
			for (i=0; i<mat.rows; ++i) mat.$(i,i,i+1);
			
			assertEquals(5, mat.rows);
			assertEquals(5, mat.cols);
			assertEquals(13, mat.nnz);
			
			// test matrix access
			var test:Function = function(i:int, j:int, v:Number):Number {

			};
			
			for (i=0; i<mat.rows; ++i) {
				for (j=0; j<mat.cols; ++j) test(i, j, mat.get(i,j));
			}
			mat.visit(test);
			mat.visitNonZero(test);
			mat.visitNonZero(nonZero);
			
			for (i=0; i<mat.rows; ++i) {
				mat.set(i,i,0);
			}
			assertEquals(8, mat.nnz);
			mat.visitNonZero(nonZero);
