Update Autotools with new PATH

47 files changed, 915 insertions, 915 deletions

diff --git a/src/c/matrixOperations/Makefile.in b/src/c/matrixOperations/Makefile.in
index f203cdc9..4ded518e 100644
--- a/src/c/matrixOperations/Makefile.in
+++ b/src/c/matrixOperations/Makefile.in
@@ -31,7 +31,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = matrixOperations
+subdir = src/c/matrixOperations
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -209,9 +209,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/cat/Makefile.am b/src/c/matrixOperations/cat/Makefile.am
index 58d218c1..fd315ddc 100644
--- a/src/c/matrixOperations/cat/Makefile.am
+++ b/src/c/matrixOperations/cat/Makefile.am
@@ -10,8 +10,8 @@
 ##
 ##
 
-libMatrixConcatenation_la_CFLAGS =	-I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes
+libMatrixConcatenation_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+					-I $(top_builddir)/src/c/matrixOperations/includes
 
 instdir = $(top_builddir)/lib
 
@@ -32,13 +32,13 @@ libMatrixConcatenation_la_SOURCES = 	$(HEAD) \
 check_PROGRAMS = 	testFloatMatrixConcatenation \
 			testDoubleMatrixConcatenation
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
 			libMatrixConcatenation.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes
 
 testDoubleMatrixConcatenation_SOURCES = testDoubleMatrixConcatenation.c
 testDoubleMatrixConcatenation_LDADD = $(check_LDADD)
diff --git a/src/c/matrixOperations/cat/Makefile.in b/src/c/matrixOperations/cat/Makefile.in
index 3226de81..38e31ef3 100644
--- a/src/c/matrixOperations/cat/Makefile.in
+++ b/src/c/matrixOperations/cat/Makefile.in
@@ -36,7 +36,7 @@ check_PROGRAMS = testFloatMatrixConcatenation$(EXEEXT) \
 	testDoubleMatrixConcatenation$(EXEEXT)
 TESTS = testFloatMatrixConcatenation$(EXEEXT) \
 	testDoubleMatrixConcatenation$(EXEEXT)
-subdir = matrixOperations/cat
+subdir = src/c/matrixOperations/cat
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -226,8 +226,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixConcatenation_la_CFLAGS = -I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes
+libMatrixConcatenation_la_CFLAGS = -I $(top_builddir)/src/c/type \
+					-I $(top_builddir)/src/c/matrixOperations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixConcatenation.la
@@ -242,13 +242,13 @@ libMatrixConcatenation_la_SOURCES = $(HEAD) \
 					zcats.c \
 					zcata.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
 			libMatrixConcatenation.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes
 
 testDoubleMatrixConcatenation_SOURCES = testDoubleMatrixConcatenation.c
 testDoubleMatrixConcatenation_LDADD = $(check_LDADD)
@@ -269,9 +269,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/cat/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/cat/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/cat/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/cat/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/chol/Makefile.am b/src/c/matrixOperations/chol/Makefile.am
index 76e9af0b..875adf20 100644
--- a/src/c/matrixOperations/chol/Makefile.am
+++ b/src/c/matrixOperations/chol/Makefile.am
@@ -10,11 +10,11 @@
 ##
 ##
 
-libMatrixChol_la_CFLAGS =	-I $(top_builddir)/type \
+libMatrixChol_la_CFLAGS =	-I $(top_builddir)/src/c/type \
 				-I .\
-				-I $(top_builddir)/matrixOperations/includes \
-				-I $(top_builddir)/operations/includes \
-				-I $(top_builddir)/elementaryFunctions/includes
+				-I $(top_builddir)/src/c/matrixOperations/includes \
+				-I $(top_builddir)/src/c/operations/includes \
+				-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 
@@ -22,39 +22,39 @@ pkglib_LTLIBRARIES = libMatrixChol.la
 
 HEAD = ../includes/chol.h
 
-libMatrixChol_la_SOURCES = 	$(HEAD) \
+libMatrixChol_la_SOURCES = 		$(HEAD) \
 					schols.c \
 					schola.c \
 					dchols.c \
 					dchola.c \
 					cchola.c \
 					zchola.c
-					
-					
-############					
-##  CHECK			
+
+
+############
+##  CHECK
 ############
 
 
 check_PROGRAMS = 	testDoubleChol   testFloatChol
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/operations/division/libDivision.la \
-			$(top_builddir)/operations/subtraction/libSubtraction.la \
-			$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/operations/division/libDivision.la \
+			$(top_builddir)/src/c/operations/subtraction/libSubtraction.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
 			libMatrixChol.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
 			-I .\
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/elementaryFunctions/includes
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 testDoubleChol_SOURCES = testDoubleChol.c
 testDoubleChol_LDADD = $(check_LDADD)
@@ -66,6 +66,6 @@ testFloatChol_CFLAGS = $(check_INCLUDES)
 
 TESTS =		testDoubleChol   testFloatChol
 
-		
-		
-		
+
+
+
diff --git a/src/c/matrixOperations/chol/Makefile.in b/src/c/matrixOperations/chol/Makefile.in
index d8bf4634..cc2f6a1f 100644
--- a/src/c/matrixOperations/chol/Makefile.in
+++ b/src/c/matrixOperations/chol/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testDoubleChol$(EXEEXT) testFloatChol$(EXEEXT)
 TESTS = testDoubleChol$(EXEEXT) testFloatChol$(EXEEXT)
-subdir = matrixOperations/chol
+subdir = src/c/matrixOperations/chol
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -211,11 +211,11 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixChol_la_CFLAGS = -I $(top_builddir)/type \
+libMatrixChol_la_CFLAGS = -I $(top_builddir)/src/c/type \
 				-I .\
-				-I $(top_builddir)/matrixOperations/includes \
-				-I $(top_builddir)/operations/includes \
-				-I $(top_builddir)/elementaryFunctions/includes
+				-I $(top_builddir)/src/c/matrixOperations/includes \
+				-I $(top_builddir)/src/c/operations/includes \
+				-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixChol.la
@@ -228,23 +228,23 @@ libMatrixChol_la_SOURCES = $(HEAD) \
 					cchola.c \
 					zchola.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/operations/division/libDivision.la \
-			$(top_builddir)/operations/subtraction/libSubtraction.la \
-			$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/operations/division/libDivision.la \
+			$(top_builddir)/src/c/operations/subtraction/libSubtraction.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
 			libMatrixChol.la
 
-check_INCLUDES = -I $(top_builddir)/type \
+check_INCLUDES = -I $(top_builddir)/src/c/type \
 			-I .\
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/elementaryFunctions/includes
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 testDoubleChol_SOURCES = testDoubleChol.c
 testDoubleChol_LDADD = $(check_LDADD)
@@ -265,9 +265,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/chol/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/chol/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/chol/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/chol/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/determ/Makefile.am b/src/c/matrixOperations/determ/Makefile.am
index 4acc9ef9..5cef2282 100644
--- a/src/c/matrixOperations/determ/Makefile.am
+++ b/src/c/matrixOperations/determ/Makefile.am
@@ -10,9 +10,9 @@
 ##
 ##
 
-libMatrixDeterm_la_CFLAGS =	-I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes \
-				-I $(top_builddir)/operations/includes
+libMatrixDeterm_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes \
+				-I $(top_builddir)/src/c/operations/includes
 
 
 instdir = $(top_builddir)/lib
@@ -26,28 +26,28 @@ libMatrixDeterm_la_SOURCES = 	$(HEAD) \
 					ddeterma.c \
 					cdeterma.c \
 					zdeterma.c
-					
-					
-############					
-##  CHECK			
+
+
+############
+##  CHECK
 ############
 
 
 check_PROGRAMS = 	testDoubleDeterm   testFloatDeterm
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/operations/subtraction/libSubtraction.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/operations/division/libDivision.la \
-			$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/operations/subtraction/libSubtraction.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/operations/division/libDivision.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
 			libMatrixDeterm.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/elementaryFunctions/includes
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 testDoubleDeterm_SOURCES = testDoubleDeterm.c
 testDoubleDeterm_LDADD = $(check_LDADD)
@@ -59,6 +59,6 @@ testFloatDeterm_CFLAGS = $(check_INCLUDES)
 
 TESTS =		testDoubleDeterm   testFloatDeterm
 
-		
-		
-		
+
+
+
diff --git a/src/c/matrixOperations/determ/Makefile.in b/src/c/matrixOperations/determ/Makefile.in
index 0a6ed3e7..7767c0fb 100644
--- a/src/c/matrixOperations/determ/Makefile.in
+++ b/src/c/matrixOperations/determ/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testDoubleDeterm$(EXEEXT) testFloatDeterm$(EXEEXT)
 TESTS = testDoubleDeterm$(EXEEXT) testFloatDeterm$(EXEEXT)
-subdir = matrixOperations/determ
+subdir = src/c/matrixOperations/determ
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -213,9 +213,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixDeterm_la_CFLAGS = -I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes \
-				-I $(top_builddir)/operations/includes
+libMatrixDeterm_la_CFLAGS = -I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes \
+				-I $(top_builddir)/src/c/operations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixDeterm.la
@@ -226,19 +226,19 @@ libMatrixDeterm_la_SOURCES = $(HEAD) \
 					cdeterma.c \
 					zdeterma.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/operations/subtraction/libSubtraction.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/operations/division/libDivision.la \
-			$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/operations/subtraction/libSubtraction.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/operations/division/libDivision.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
 			libMatrixDeterm.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/elementaryFunctions/includes
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 testDoubleDeterm_SOURCES = testDoubleDeterm.c
 testDoubleDeterm_LDADD = $(check_LDADD)
@@ -259,9 +259,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/determ/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/determ/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/determ/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/determ/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/dist/Makefile.am b/src/c/matrixOperations/dist/Makefile.am
index d9f786df..a4a8b000 100644
--- a/src/c/matrixOperations/dist/Makefile.am
+++ b/src/c/matrixOperations/dist/Makefile.am
@@ -10,11 +10,11 @@
 ##
 ##
 
-libDist_la_CFLAGS =	-I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes \
-				-I $(top_builddir)/operations/includes \
-				-I $(top_builddir)/elementaryFunctions/includes\
-				-I $(top_builddir)/auxiliaryFunctions/includes
+libDist_la_CFLAGS =		-I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes \
+				-I $(top_builddir)/src/c/operations/includes \
+				-I $(top_builddir)/src/c/elementaryFunctions/includes\
+				-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 
 instdir = $(top_builddir)/lib
@@ -23,7 +23,7 @@ pkglib_LTLIBRARIES = libDist.la
 
 HEAD = ../includes/dist.h
 
-libDist_la_SOURCES = 	$(HEAD) \
+libDist_la_SOURCES = 			$(HEAD) \
 					sdists.c \
 					sdista.c \
 					ddists.c \
@@ -32,45 +32,45 @@ libDist_la_SOURCES = 	$(HEAD) \
 					cdista.c \
 					zdists.c \
 					zdista.c
-					
-					
-############					
-##  CHECK			
+
+
+############
+##  CHECK
 ############
 
 
 check_PROGRAMS = 	testDoubleDist   testFloatDist
 
-check_LDADD =	$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/elementaryFunctions/pow/libPow.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/exp/libExp.la \
-			$(top_builddir)/elementaryFunctions/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/elementaryFunctions/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-			$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/subtraction/libSubtraction.la \
-			$(top_builddir)/matrixOperations/multiplication/libMatrixMultiplication.la \
-			$(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \
-			$(top_builddir)/matrixOperations/spec/libSpec.la \
-			$(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/c/elementaryFunctions/pow/libPow.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp/libExp.la \
+			$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la \
+			$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+			$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/subtraction/libSubtraction.la \
+			$(top_builddir)/src/c/matrixOperations/multiplication/libMatrixMultiplication.la \
+			$(top_builddir)/src/c/matrixOperations/transpose/libMatrixTranspose.la \
+			$(top_builddir)/src/c/matrixOperations/spec/libSpec.la \
+			$(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \
 			libDist.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/elementaryFunctions/includes\
-			-I $(top_builddir)/auxiliaryFunctions/includes 
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes\
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 testDoubleDist_SOURCES = testDoubleDist.c
 testDoubleDist_LDADD = $(check_LDADD)
@@ -82,6 +82,6 @@ testFloatDist_CFLAGS = $(check_INCLUDES)
 
 TESTS =		testDoubleDist   testFloatDist
 
-		
-		
-		
+
+
+
diff --git a/src/c/matrixOperations/dist/Makefile.in b/src/c/matrixOperations/dist/Makefile.in
index 04ac731f..2cd65cf3 100644
--- a/src/c/matrixOperations/dist/Makefile.in
+++ b/src/c/matrixOperations/dist/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testDoubleDist$(EXEEXT) testFloatDist$(EXEEXT)
 TESTS = testDoubleDist$(EXEEXT) testFloatDist$(EXEEXT)
-subdir = matrixOperations/dist
+subdir = src/c/matrixOperations/dist
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -211,11 +211,11 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libDist_la_CFLAGS = -I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes \
-				-I $(top_builddir)/operations/includes \
-				-I $(top_builddir)/elementaryFunctions/includes\
-				-I $(top_builddir)/auxiliaryFunctions/includes
+libDist_la_CFLAGS = -I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes \
+				-I $(top_builddir)/src/c/operations/includes \
+				-I $(top_builddir)/src/c/elementaryFunctions/includes\
+				-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libDist.la
@@ -230,36 +230,36 @@ libDist_la_SOURCES = $(HEAD) \
 					zdists.c \
 					zdista.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/elementaryFunctions/pow/libPow.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/exp/libExp.la \
-			$(top_builddir)/elementaryFunctions/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/elementaryFunctions/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-			$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/subtraction/libSubtraction.la \
-			$(top_builddir)/matrixOperations/multiplication/libMatrixMultiplication.la \
-			$(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \
-			$(top_builddir)/matrixOperations/spec/libSpec.la \
-			$(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/c/elementaryFunctions/pow/libPow.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp/libExp.la \
+			$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la \
+			$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+			$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/subtraction/libSubtraction.la \
+			$(top_builddir)/src/c/matrixOperations/multiplication/libMatrixMultiplication.la \
+			$(top_builddir)/src/c/matrixOperations/transpose/libMatrixTranspose.la \
+			$(top_builddir)/src/c/matrixOperations/spec/libSpec.la \
+			$(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \
 			libDist.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/elementaryFunctions/includes\
-			-I $(top_builddir)/auxiliaryFunctions/includes 
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes\
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 testDoubleDist_SOURCES = testDoubleDist.c
 testDoubleDist_LDADD = $(check_LDADD)
@@ -280,9 +280,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/dist/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/dist/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/dist/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/dist/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/division/Makefile.am b/src/c/matrixOperations/division/Makefile.am
index 2d7e5dc8..71ec2439 100644
--- a/src/c/matrixOperations/division/Makefile.am
+++ b/src/c/matrixOperations/division/Makefile.am
@@ -10,11 +10,11 @@
 ##
 ##
 
-libMatrixDivision_la_CFLAGS =	-I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes \
-				-I $(top_builddir)/auxiliaryFunctions/includes \
-				-I $(top_builddir)/operations/includes \
-				-I $(top_builddir)/elementaryFunctions/includes
+libMatrixDivision_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes \
+				-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+				-I $(top_builddir)/src/c/operations/includes \
+				-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 
@@ -35,23 +35,23 @@ libMatrixDivision_la_SOURCES = 	$(HEAD) \
 check_PROGRAMS = 	testMatrixRDivision \
 			testMatrixLDivision
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \
-			$(top_builddir)/matrixOperations/inversion/libMatrixInversion.la \
-			$(top_builddir)/matrixOperations/multiplication/libMatrixMultiplication.la \
-			$(top_builddir)/matrixOperations/cat/libMatrixConcatenation.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/c/matrixOperations/transpose/libMatrixTranspose.la \
+			$(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la \
+			$(top_builddir)/src/c/matrixOperations/multiplication/libMatrixMultiplication.la \
+			$(top_builddir)/src/c/matrixOperations/cat/libMatrixConcatenation.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
 			libMatrixDivision.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/elementaryFunctions/includes
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 ztestMatrixLDivision_SOURCES =    testMatrixLDivision.c
 testMatrixLDivision_LDADD = $(check_LDADD)
diff --git a/src/c/matrixOperations/division/Makefile.in b/src/c/matrixOperations/division/Makefile.in
index d2f1f0be..f00b1c8e 100644
--- a/src/c/matrixOperations/division/Makefile.in
+++ b/src/c/matrixOperations/division/Makefile.in
@@ -35,7 +35,7 @@ host_triplet = @host@
 check_PROGRAMS = testMatrixRDivision$(EXEEXT) \
 	testMatrixLDivision$(EXEEXT)
 TESTS = testMatrixRDivision$(EXEEXT) testMatrixLDivision$(EXEEXT)
-subdir = matrixOperations/division
+subdir = src/c/matrixOperations/division
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -222,11 +222,11 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixDivision_la_CFLAGS = -I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes \
-				-I $(top_builddir)/auxiliaryFunctions/includes \
-				-I $(top_builddir)/operations/includes \
-				-I $(top_builddir)/elementaryFunctions/includes
+libMatrixDivision_la_CFLAGS = -I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes \
+				-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+				-I $(top_builddir)/src/c/operations/includes \
+				-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixDivision.la
@@ -241,23 +241,23 @@ libMatrixDivision_la_SOURCES = $(HEAD) \
 				crdivma.c \
 				cldivma.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \
-			$(top_builddir)/matrixOperations/inversion/libMatrixInversion.la \
-			$(top_builddir)/matrixOperations/multiplication/libMatrixMultiplication.la \
-			$(top_builddir)/matrixOperations/cat/libMatrixConcatenation.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/c/matrixOperations/transpose/libMatrixTranspose.la \
+			$(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la \
+			$(top_builddir)/src/c/matrixOperations/multiplication/libMatrixMultiplication.la \
+			$(top_builddir)/src/c/matrixOperations/cat/libMatrixConcatenation.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
 			libMatrixDivision.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/elementaryFunctions/includes
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 ztestMatrixLDivision_SOURCES = testMatrixLDivision.c
 testMatrixLDivision_LDADD = $(check_LDADD)
@@ -278,9 +278,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/division/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/division/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/division/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/division/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/expm/Makefile.am b/src/c/matrixOperations/expm/Makefile.am
index a8c909cf..2e9f2724 100644
--- a/src/c/matrixOperations/expm/Makefile.am
+++ b/src/c/matrixOperations/expm/Makefile.am
@@ -10,12 +10,12 @@
 ##
 ##
 
-libMatrixExponential_la_CFLAGS =	-I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes \
-					-I $(top_builddir)/auxiliaryFunctions/includes \
+libMatrixExponential_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+					-I $(top_builddir)/src/c/matrixOperations/includes \
+					-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
 					-I $(top_builddir)/includes \
-					-I $(top_builddir)/elementaryFunctions/includes \
-					-I $(top_builddir)/operations/includes
+					-I $(top_builddir)/src/c/elementaryFunctions/includes \
+					-I $(top_builddir)/src/c/operations/includes
 
 instdir = $(top_builddir)/lib
 
@@ -26,49 +26,49 @@ HEAD = ../includes/matrixExponential.h
 libMatrixExponential_la_SOURCES = 	$(HEAD) \
 					dexpma.c \
 					zexpma.c \
-                    sexpma.c \
-                    cexpma.c
+		 			sexpma.c \
+					cexpma.c
 
 
 check_PROGRAMS = 	testMatrixExponential
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/subtraction/libSubtraction.la \
-			$(top_builddir)/matrixOperations/division/libMatrixDivision.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/sign/libSign.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/auxiliaryFunctions/frexp/libFrexp.la \
-			$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/exp/libExp.la \
-			$(top_builddir)/elementaryFunctions/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/pow/libPow.la \
-			$(top_builddir)/elementaryFunctions/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la\
-			$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-			$(top_builddir)/elementaryFunctions/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-			$(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \
-			$(top_builddir)/matrixOperations/cat/libMatrixConcatenation.la \
-			$(top_builddir)/matrixOperations/multiplication/libMatrixMultiplication.la \
-			$(top_builddir)/matrixOperations/infiniteNorm/libMatrixInfiniteNorm.la \
-			$(top_builddir)/matrixOperations/eye/libMatrixEye.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/operations/division/libDivision.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/subtraction/libSubtraction.la \
+			$(top_builddir)/src/c/matrixOperations/division/libMatrixDivision.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/frexp/libFrexp.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp/libExp.la \
+			$(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/pow/libPow.la \
+			$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la\
+			$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+			$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+			$(top_builddir)/src/cmatrixOperations/transpose/libMatrixTranspose.la \
+			$(top_builddir)/src/c/matrixOperations/cat/libMatrixConcatenation.la \
+			$(top_builddir)/src/c/matrixOperations/multiplication/libMatrixMultiplication.la \
+			$(top_builddir)/src/c/matrixOperations/infiniteNorm/libMatrixInfiniteNorm.la \
+			$(top_builddir)/src/c/matrixOperations/eye/libMatrixEye.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/operations/division/libDivision.la \
 			libMatrixExponential.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
 			-I $(top_builddir)/includes \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/operations/includes
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/operations/includes
 
 
 testMatrixExponential_SOURCES = 	testMatrixExponential.c
diff --git a/src/c/matrixOperations/expm/Makefile.in b/src/c/matrixOperations/expm/Makefile.in
index a3749810..7c5a75ec 100644
--- a/src/c/matrixOperations/expm/Makefile.in
+++ b/src/c/matrixOperations/expm/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testMatrixExponential$(EXEEXT)
 TESTS = testMatrixExponential$(EXEEXT)
-subdir = matrixOperations/expm
+subdir = src/c/matrixOperations/expm
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -210,12 +210,12 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixExponential_la_CFLAGS = -I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes \
-					-I $(top_builddir)/auxiliaryFunctions/includes \
+libMatrixExponential_la_CFLAGS = -I $(top_builddir)/src/c/type \
+					-I $(top_builddir)/src/c/matrixOperations/includes \
+					-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
 					-I $(top_builddir)/includes \
-					-I $(top_builddir)/elementaryFunctions/includes \
-					-I $(top_builddir)/operations/includes
+					-I $(top_builddir)/src/c/elementaryFunctions/includes \
+					-I $(top_builddir)/src/c/operations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixExponential.la
@@ -223,46 +223,46 @@ HEAD = ../includes/matrixExponential.h
 libMatrixExponential_la_SOURCES = $(HEAD) \
 					dexpma.c \
 					zexpma.c \
-                    sexpma.c \
-                    cexpma.c
-
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/subtraction/libSubtraction.la \
-			$(top_builddir)/matrixOperations/division/libMatrixDivision.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/sign/libSign.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/auxiliaryFunctions/frexp/libFrexp.la \
-			$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/exp/libExp.la \
-			$(top_builddir)/elementaryFunctions/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/pow/libPow.la \
-			$(top_builddir)/elementaryFunctions/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la\
-			$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-			$(top_builddir)/elementaryFunctions/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-			$(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \
-			$(top_builddir)/matrixOperations/cat/libMatrixConcatenation.la \
-			$(top_builddir)/matrixOperations/multiplication/libMatrixMultiplication.la \
-			$(top_builddir)/matrixOperations/infiniteNorm/libMatrixInfiniteNorm.la \
-			$(top_builddir)/matrixOperations/eye/libMatrixEye.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/operations/division/libDivision.la \
+		 			sexpma.c \
+					cexpma.c
+
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/subtraction/libSubtraction.la \
+			$(top_builddir)/src/c/matrixOperations/division/libMatrixDivision.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/frexp/libFrexp.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp/libExp.la \
+			$(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/pow/libPow.la \
+			$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la\
+			$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+			$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+			$(top_builddir)/src/cmatrixOperations/transpose/libMatrixTranspose.la \
+			$(top_builddir)/src/c/matrixOperations/cat/libMatrixConcatenation.la \
+			$(top_builddir)/src/c/matrixOperations/multiplication/libMatrixMultiplication.la \
+			$(top_builddir)/src/c/matrixOperations/infiniteNorm/libMatrixInfiniteNorm.la \
+			$(top_builddir)/src/c/matrixOperations/eye/libMatrixEye.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/operations/division/libDivision.la \
 			libMatrixExponential.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
 			-I $(top_builddir)/includes \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/operations/includes
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/operations/includes
 
 testMatrixExponential_SOURCES = testMatrixExponential.c
 testMatrixExponential_LDADD = $(check_LDADD)
@@ -280,9 +280,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/expm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/expm/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/expm/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/expm/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/eye/Makefile.am b/src/c/matrixOperations/eye/Makefile.am
index 74280acd..706830dc 100644
--- a/src/c/matrixOperations/eye/Makefile.am
+++ b/src/c/matrixOperations/eye/Makefile.am
@@ -10,8 +10,8 @@
 ##
 ##
 
-libMatrixEye_la_CFLAGS =	-I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes \
+libMatrixEye_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes \
 				-I $(top_builddir)/includes
 
 
@@ -25,19 +25,19 @@ libMatrixEye_la_SOURCES = 	$(HEAD) \
 				seyea.c \
 				deyea.c \
 				ceyea.c \
-				zeyea.c 
+				zeyea.c
 
 
 
 check_PROGRAMS = 	testMatrixEye
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
 			libMatrixEye.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/includes
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/includes
 
 testMatrixEye_SOURCES = testMatrixEye.c
 testMatrixEye_LDADD = $(check_LDADD)
diff --git a/src/c/matrixOperations/eye/Makefile.in b/src/c/matrixOperations/eye/Makefile.in
index 2729071c..0dac4225 100644
--- a/src/c/matrixOperations/eye/Makefile.in
+++ b/src/c/matrixOperations/eye/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testMatrixEye$(EXEEXT)
 TESTS = testMatrixEye$(EXEEXT)
-subdir = matrixOperations/eye
+subdir = src/c/matrixOperations/eye
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -202,8 +202,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixEye_la_CFLAGS = -I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes \
+libMatrixEye_la_CFLAGS = -I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes \
 				-I $(top_builddir)/includes
 
 instdir = $(top_builddir)/lib
@@ -213,15 +213,15 @@ libMatrixEye_la_SOURCES = $(HEAD) \
 				seyea.c \
 				deyea.c \
 				ceyea.c \
-				zeyea.c 
+				zeyea.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
 			libMatrixEye.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/includes
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/includes
 
 testMatrixEye_SOURCES = testMatrixEye.c
 testMatrixEye_LDADD = $(check_LDADD)
@@ -239,9 +239,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/eye/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/eye/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/eye/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/eye/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/fill/Makefile.am b/src/c/matrixOperations/fill/Makefile.am
index 29329a53..e7506e2d 100644
--- a/src/c/matrixOperations/fill/Makefile.am
+++ b/src/c/matrixOperations/fill/Makefile.am
@@ -10,8 +10,8 @@
 ##
 ##
 
-libMatrixFill_la_CFLAGS =	-I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes
+libMatrixFill_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes
 
 instdir = $(top_builddir)/lib
 
@@ -19,26 +19,26 @@ pkglib_LTLIBRARIES = libMatrixFill.la
 
 HEAD = ../includes/fill.h
 
-libMatrixFill_la_SOURCES = 	$(HEAD) \
+libMatrixFill_la_SOURCES = 		$(HEAD) \
 					sfilla.c \
 					dfilla.c \
 					cfilla.c \
 					zfilla.c
-					
-					
-############					
-##  CHECK			
+
+
+############
+##  CHECK
 ############
 
 
 check_PROGRAMS = 	testDoubleFill   testFloatFill
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
 			libMatrixFill.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes
 
 testDoubleFill_SOURCES = testDoubleFill.c
 testDoubleFill_LDADD = $(check_LDADD)
@@ -50,6 +50,6 @@ testFloatFill_CFLAGS = $(check_INCLUDES)
 
 TESTS =		testDoubleFill   testFloatFill
 
-		
-		
-		
+
+
+
diff --git a/src/c/matrixOperations/fill/Makefile.in b/src/c/matrixOperations/fill/Makefile.in
index 6afc3a49..17a34f78 100644
--- a/src/c/matrixOperations/fill/Makefile.in
+++ b/src/c/matrixOperations/fill/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testDoubleFill$(EXEEXT) testFloatFill$(EXEEXT)
 TESTS = testDoubleFill$(EXEEXT) testFloatFill$(EXEEXT)
-subdir = matrixOperations/fill
+subdir = src/c/matrixOperations/fill
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -210,8 +210,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixFill_la_CFLAGS = -I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes
+libMatrixFill_la_CFLAGS = -I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixFill.la
@@ -222,12 +222,12 @@ libMatrixFill_la_SOURCES = $(HEAD) \
 					cfilla.c \
 					zfilla.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
 			libMatrixFill.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes
 
 testDoubleFill_SOURCES = testDoubleFill.c
 testDoubleFill_LDADD = $(check_LDADD)
@@ -248,9 +248,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/fill/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/fill/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/fill/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/fill/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/hilbert/Makefile.am b/src/c/matrixOperations/hilbert/Makefile.am
index 0b5ca42d..4ffb7ccb 100644
--- a/src/c/matrixOperations/hilbert/Makefile.am
+++ b/src/c/matrixOperations/hilbert/Makefile.am
@@ -10,8 +10,8 @@
 ##
 ##
 
-libHilbert_la_CFLAGS =	-I $(top_builddir)/type \
-				-I ../includes
+libHilbert_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I ../includes
 
 instdir = $(top_builddir)/lib
 
@@ -27,7 +27,7 @@ check_PROGRAMS = 	testHilbert
 
 check_LDADD =   libHilbert.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
 			-I ../includes
 
 testHilbert_SOURCES = testHilbert.c
diff --git a/src/c/matrixOperations/hilbert/Makefile.in b/src/c/matrixOperations/hilbert/Makefile.in
index d9776594..869d4ae7 100644
--- a/src/c/matrixOperations/hilbert/Makefile.in
+++ b/src/c/matrixOperations/hilbert/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testHilbert$(EXEEXT)
 TESTS = testHilbert$(EXEEXT)
-subdir = matrixOperations/hilbert
+subdir = src/c/matrixOperations/hilbert
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -201,8 +201,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libHilbert_la_CFLAGS = -I $(top_builddir)/type \
-				-I ../includes
+libHilbert_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I ../includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libHilbert.la
@@ -212,7 +212,7 @@ libHilbert_la_SOURCES = $(HEAD) \
 				dhilba.c
 
 check_LDADD = libHilbert.la
-check_INCLUDES = -I $(top_builddir)/type \
+check_INCLUDES = -I $(top_builddir)/src/c/type \
 			-I ../includes
 
 testHilbert_SOURCES = testHilbert.c
@@ -231,9 +231,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/hilbert/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/hilbert/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/hilbert/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/hilbert/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/infiniteNorm/Makefile.am b/src/c/matrixOperations/infiniteNorm/Makefile.am
index 0fae9268..5cc3503c 100644
--- a/src/c/matrixOperations/infiniteNorm/Makefile.am
+++ b/src/c/matrixOperations/infiniteNorm/Makefile.am
@@ -10,12 +10,12 @@
 ##
 ##
 
-libMatrixInfiniteNorm_la_CFLAGS =	-I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes \
-					-I $(top_builddir)/auxiliaryFunctions/includes \
+libMatrixInfiniteNorm_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+					-I $(top_builddir)/src/c/matrixOperations/includes \
+					-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
 					-I $(top_builddir)/includes \
-					-I $(top_builddir)/elementaryFunctions/includes \
-					-I $(top_builddir)/operations/includes
+					-I $(top_builddir)/src/c/elementaryFunctions/includes \
+					-I $(top_builddir)/src/c/operations/includes
 
 
 instdir = $(top_builddir)/lib
@@ -32,24 +32,24 @@ libMatrixInfiniteNorm_la_SOURCES = 	$(HEAD) \
 
 check_PROGRAMS = 	testMatrixInfiniteNorm
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/sign/libSign.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			libMatrixInfiniteNorm.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
 			-I $(top_builddir)/includes \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/operations/includes
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/operations/includes
 
 testMatrixInfiniteNorm_SOURCES = testMatrixInfiniteNorm.c
 testMatrixInfiniteNorm_LDADD = $(check_LDADD)
diff --git a/src/c/matrixOperations/infiniteNorm/Makefile.in b/src/c/matrixOperations/infiniteNorm/Makefile.in
index a9aa76b9..5308c606 100644
--- a/src/c/matrixOperations/infiniteNorm/Makefile.in
+++ b/src/c/matrixOperations/infiniteNorm/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testMatrixInfiniteNorm$(EXEEXT)
 TESTS = testMatrixInfiniteNorm$(EXEEXT)
-subdir = matrixOperations/infiniteNorm
+subdir = src/c/matrixOperations/infiniteNorm
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -210,12 +210,12 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixInfiniteNorm_la_CFLAGS = -I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes \
-					-I $(top_builddir)/auxiliaryFunctions/includes \
+libMatrixInfiniteNorm_la_CFLAGS = -I $(top_builddir)/src/c/type \
+					-I $(top_builddir)/src/c/matrixOperations/includes \
+					-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
 					-I $(top_builddir)/includes \
-					-I $(top_builddir)/elementaryFunctions/includes \
-					-I $(top_builddir)/operations/includes
+					-I $(top_builddir)/src/c/elementaryFunctions/includes \
+					-I $(top_builddir)/src/c/operations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixInfiniteNorm.la
@@ -226,24 +226,24 @@ libMatrixInfiniteNorm_la_SOURCES = $(HEAD) \
 				cinfnorma.c \
 				zinfnorma.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/sign/libSign.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			libMatrixInfiniteNorm.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
 			-I $(top_builddir)/includes \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/operations/includes
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/operations/includes
 
 testMatrixInfiniteNorm_SOURCES = testMatrixInfiniteNorm.c
 testMatrixInfiniteNorm_LDADD = $(check_LDADD)
@@ -261,9 +261,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/infiniteNorm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/infiniteNorm/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/infiniteNorm/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/infiniteNorm/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/inversion/Makefile.am b/src/c/matrixOperations/inversion/Makefile.am
index 1c063ba2..aa5890e3 100644
--- a/src/c/matrixOperations/inversion/Makefile.am
+++ b/src/c/matrixOperations/inversion/Makefile.am
@@ -10,11 +10,11 @@
 ##
 ##
 
-libMatrixInversion_la_CFLAGS =	-I $(top_builddir)/type \
-						-I $(top_builddir)/matrixOperations/includes \
-						-I $(top_builddir)/auxiliaryFunctions/includes \
-						-I $(top_builddir)/includes \
-						-I $(top_builddir)/elementaryFunctions/includes
+libMatrixInversion_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes \
+				-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+				-I $(top_builddir)/includes \
+				-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 
 instdir = $(top_builddir)/lib
@@ -31,23 +31,23 @@ libMatrixInversion_la_SOURCES =	$(HEAD) \
 
 check_PROGRAMS = 	testMatrixInversion
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/sign/libSign.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			libMatrixInversion.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes \
-                    -I $(top_builddir)/auxiliaryFunctions/includes \
-                    -I $(top_builddir)/includes \
-                    -I $(top_builddir)/elementaryFunctions/includes
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+                    	-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+                    	-I $(top_builddir)/includes \
+                    	-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 testMatrixInversion_SOURCES = testMatrixInversion.c
 testMatrixInversion_LDADD = $(check_LDADD)
diff --git a/src/c/matrixOperations/inversion/Makefile.in b/src/c/matrixOperations/inversion/Makefile.in
index fd6caa0b..daff367a 100644
--- a/src/c/matrixOperations/inversion/Makefile.in
+++ b/src/c/matrixOperations/inversion/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testMatrixInversion$(EXEEXT)
 TESTS = testMatrixInversion$(EXEEXT)
-subdir = matrixOperations/inversion
+subdir = src/c/matrixOperations/inversion
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -209,11 +209,11 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixInversion_la_CFLAGS = -I $(top_builddir)/type \
-						-I $(top_builddir)/matrixOperations/includes \
-						-I $(top_builddir)/auxiliaryFunctions/includes \
-						-I $(top_builddir)/includes \
-						-I $(top_builddir)/elementaryFunctions/includes
+libMatrixInversion_la_CFLAGS = -I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes \
+				-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+				-I $(top_builddir)/includes \
+				-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixInversion.la
@@ -224,23 +224,23 @@ libMatrixInversion_la_SOURCES = $(HEAD) \
 				cinverma.c \
 		                zinverma.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/sign/libSign.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			libMatrixInversion.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes \
-                    -I $(top_builddir)/auxiliaryFunctions/includes \
-                    -I $(top_builddir)/includes \
-                    -I $(top_builddir)/elementaryFunctions/includes
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+                    	-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+                    	-I $(top_builddir)/includes \
+                    	-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 testMatrixInversion_SOURCES = testMatrixInversion.c
 testMatrixInversion_LDADD = $(check_LDADD)
@@ -258,9 +258,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/inversion/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/inversion/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/inversion/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/inversion/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/jmat/Makefile.am b/src/c/matrixOperations/jmat/Makefile.am
index 4cd7f9e1..08afef59 100644
--- a/src/c/matrixOperations/jmat/Makefile.am
+++ b/src/c/matrixOperations/jmat/Makefile.am
@@ -10,7 +10,7 @@
 ##
 ##
 
-libJmat_la_CFLAGS=	-I $(top_builddir)/matrixOperations/includes
+libJmat_la_CFLAGS=	-I $(top_builddir)/src/c/matrixOperations/includes
 
 instdir = $(top_builddir)/lib
 
@@ -22,14 +22,14 @@ libJmat_la_SOURCES = 	$(HEAD) \
 			sjmata.c \
 			djmata.c
 
-check_PROGRAMS = 	testJmat 
+check_PROGRAMS = 	testJmat
 
 check_LDADD =		libJmat.la
 
-check_INCLUDES =	-I $(top_builddir)/matrixOperations/includes
+check_INCLUDES =	-I $(top_builddir)/src/c/matrixOperations/includes
 
 testJmat_SOURCES = testJmat.c
 testJmat_LDADD = $(check_LDADD)
 testJmat_CFLAGS = $(check_INCLUDES)
 
-TESTS =		testJmat 
+TESTS =		testJmat
diff --git a/src/c/matrixOperations/jmat/Makefile.in b/src/c/matrixOperations/jmat/Makefile.in
index 28fcb1e3..2d1db1e3 100644
--- a/src/c/matrixOperations/jmat/Makefile.in
+++ b/src/c/matrixOperations/jmat/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testJmat$(EXEEXT)
 TESTS = testJmat$(EXEEXT)
-subdir = matrixOperations/jmat
+subdir = src/c/matrixOperations/jmat
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -201,7 +201,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libJmat_la_CFLAGS = -I $(top_builddir)/matrixOperations/includes
+libJmat_la_CFLAGS = -I $(top_builddir)/src/c/matrixOperations/includes
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libJmat.la
 HEAD = ../includes/jmat.h
@@ -210,7 +210,7 @@ libJmat_la_SOURCES = $(HEAD) \
 			djmata.c
 
 check_LDADD = libJmat.la
-check_INCLUDES = -I $(top_builddir)/matrixOperations/includes
+check_INCLUDES = -I $(top_builddir)/src/c/matrixOperations/includes
 testJmat_SOURCES = testJmat.c
 testJmat_LDADD = $(check_LDADD)
 testJmat_CFLAGS = $(check_INCLUDES)
@@ -227,9 +227,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/jmat/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/jmat/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/jmat/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/jmat/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/logm/Makefile.am b/src/c/matrixOperations/logm/Makefile.am
index b4ad83f9..f21ded7d 100644
--- a/src/c/matrixOperations/logm/Makefile.am
+++ b/src/c/matrixOperations/logm/Makefile.am
@@ -14,11 +14,11 @@
 
 
 libLogm_la_CFLAGS =	-I ./includes \
-			-I $(top_builddir)/type \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/matrixOperations/includes
+			-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/matrixOperations/includes
 
 
 instdir = $(top_builddir)/lib
@@ -29,46 +29,46 @@ pkglib_LTLIBRARIES = libLogm.la
 HEAD = ../includes/logm.h
 
 
-libLogm_la_SOURCES = 	$(HEAD) \
+libLogm_la_SOURCES = 		$(HEAD) \
 				 zlogma.c \
 				 clogma.c \
 				 slogma.c \
-				 dlogma.c 
-				
+				 dlogma.c
+
 #############
 ##  CHECK  ##
 #############
-					
+
 check_PROGRAMS = 	testDoubleLogm	testFloatLogm
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-				$(top_builddir)/type/libFloatComplex.la \
-				$(top_builddir)/lib/lapack/libscilapack.la \
-				$(top_builddir)/lib/blas/libsciblas.la \
-				$(top_builddir)/elementaryFunctions/log/libLog.la \
-				$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-				$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-				$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-				$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-				$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
-				$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-				$(top_builddir)/auxiliaryFunctions/sign/libSign.la \
-				$(top_builddir)/operations/multiplication/libMultiplication.la \
-				$(top_builddir)/operations/addition/libAddition.la \
-				$(top_builddir)/matrixOperations/multiplication/libMatrixMultiplication.la \
-				$(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \
-				$(top_builddir)/matrixOperations/inversion/libMatrixInversion.la \
-				$(top_builddir)/matrixOperations/spec2/libSpec2.la \
-				$(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \
-				$(top_builddir)/matrixOperations/logm/libLogm.la
-
-			
+check_LDADD =			$(top_builddir)/src/c/type/libDoubleComplex.la \
+				$(top_builddir)/src/c/type/libFloatComplex.la \
+				$(top_builddir)/src/fortran/lapack/libscilapack.la \
+				$(top_builddir)/src/fortran/blas/libsciblas.la \
+				$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+				$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+				$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+				$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la \
+				$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+				$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
+				$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+				$(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \
+				$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+				$(top_builddir)/src/c/operations/addition/libAddition.la \
+				$(top_builddir)/src/c/matrixOperations/multiplication/libMatrixMultiplication.la \
+				$(top_builddir)/src/c/matrixOperations/transpose/libMatrixTranspose.la \
+				$(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la \
+				$(top_builddir)/src/c/matrixOperations/spec2/libSpec2.la \
+				$(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \
+				$(top_builddir)/src/c/matrixOperations/logm/libLogm.la
+
+
 check_INCLUDES =	-I ./includes \
-			-I $(top_builddir)/type \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/matrixOperations/includes
+			-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/matrixOperations/includes
 
 testDoubleLogm_SOURCES = testDoubleLogm.c
 testDoubleLogm_LDADD = $(check_LDADD)
diff --git a/src/c/matrixOperations/logm/Makefile.in b/src/c/matrixOperations/logm/Makefile.in
index 4d33cda8..dce1f65e 100644
--- a/src/c/matrixOperations/logm/Makefile.in
+++ b/src/c/matrixOperations/logm/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testDoubleLogm$(EXEEXT) testFloatLogm$(EXEEXT)
 TESTS = testDoubleLogm$(EXEEXT) testFloatLogm$(EXEEXT)
-subdir = matrixOperations/logm
+subdir = src/c/matrixOperations/logm
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -210,11 +210,11 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libLogm_la_CFLAGS = -I ./includes \
-			-I $(top_builddir)/type \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/matrixOperations/includes
+			-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/matrixOperations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libLogm.la
@@ -223,35 +223,35 @@ libLogm_la_SOURCES = $(HEAD) \
 				 zlogma.c \
 				 clogma.c \
 				 slogma.c \
-				 dlogma.c 
-
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-				$(top_builddir)/type/libFloatComplex.la \
-				$(top_builddir)/lib/lapack/libscilapack.la \
-				$(top_builddir)/lib/blas/libsciblas.la \
-				$(top_builddir)/elementaryFunctions/log/libLog.la \
-				$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-				$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-				$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-				$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-				$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
-				$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-				$(top_builddir)/auxiliaryFunctions/sign/libSign.la \
-				$(top_builddir)/operations/multiplication/libMultiplication.la \
-				$(top_builddir)/operations/addition/libAddition.la \
-				$(top_builddir)/matrixOperations/multiplication/libMatrixMultiplication.la \
-				$(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \
-				$(top_builddir)/matrixOperations/inversion/libMatrixInversion.la \
-				$(top_builddir)/matrixOperations/spec2/libSpec2.la \
-				$(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \
-				$(top_builddir)/matrixOperations/logm/libLogm.la
+				 dlogma.c
+
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+				$(top_builddir)/src/c/type/libFloatComplex.la \
+				$(top_builddir)/src/fortran/lapack/libscilapack.la \
+				$(top_builddir)/src/fortran/blas/libsciblas.la \
+				$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+				$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+				$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+				$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la \
+				$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+				$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
+				$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+				$(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \
+				$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+				$(top_builddir)/src/c/operations/addition/libAddition.la \
+				$(top_builddir)/src/c/matrixOperations/multiplication/libMatrixMultiplication.la \
+				$(top_builddir)/src/c/matrixOperations/transpose/libMatrixTranspose.la \
+				$(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la \
+				$(top_builddir)/src/c/matrixOperations/spec2/libSpec2.la \
+				$(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \
+				$(top_builddir)/src/c/matrixOperations/logm/libLogm.la
 
 check_INCLUDES = -I ./includes \
-			-I $(top_builddir)/type \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/matrixOperations/includes
+			-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/matrixOperations/includes
 
 testDoubleLogm_SOURCES = testDoubleLogm.c
 testDoubleLogm_LDADD = $(check_LDADD)
@@ -272,9 +272,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/logm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/logm/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/logm/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/logm/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/magnitude/Makefile.am b/src/c/matrixOperations/magnitude/Makefile.am
index cf177ca4..98749646 100644
--- a/src/c/matrixOperations/magnitude/Makefile.am
+++ b/src/c/matrixOperations/magnitude/Makefile.am
@@ -10,11 +10,11 @@
 ##
 ##
 
-libMatrixMagnitude_la_CFLAGS =	-I $(top_builddir)/type \
-						-I $(top_builddir)/matrixOperations/includes \
-						-I $(top_builddir)/auxiliaryFunctions/includes \
-						-I $(top_builddir)/operations/includes \
-						-I $(top_builddir)/elementaryFunctions/includes
+libMatrixMagnitude_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes \
+				-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+				-I $(top_builddir)/src/c/operations/includes \
+				-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 
@@ -31,29 +31,29 @@ libMatrixMagnitude_la_SOURCES = 	$(HEAD) \
 					cmagna.c \
 					zmagns.c \
 					zmagna.c
-					
+
 #############
 ##  CHECK  ##
 #############
 
 check_PROGRAMS = 	testDoubleMatrixMagnitude   testFloatMatrixMagnitude
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-				$(top_builddir)/type/libFloatComplex.la \
-				$(top_builddir)/operations/addition/libAddition.la \
-				$(top_builddir)/lib/lapack/libscilapack.la \
-				$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-				$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-				$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-				$(top_builddir)/operations/multiplication/libMultiplication.la \
-				$(top_builddir)/operations/addition/libAddition.la \
-				libMatrixMagnitude.la
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			libMatrixMagnitude.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/operations/includes \		
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/elementaryFunctions/includes
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 testDoubleMatrixMagnitude_SOURCES = 	testDoubleMagnitude.c
 testDoubleMatrixMagnitude_LDADD = $(check_LDADD)
diff --git a/src/c/matrixOperations/magnitude/Makefile.in b/src/c/matrixOperations/magnitude/Makefile.in
index 04f737b5..bf3a11f9 100644
--- a/src/c/matrixOperations/magnitude/Makefile.in
+++ b/src/c/matrixOperations/magnitude/Makefile.in
@@ -36,7 +36,7 @@ check_PROGRAMS = testDoubleMatrixMagnitude$(EXEEXT) \
 	testFloatMatrixMagnitude$(EXEEXT)
 TESTS = testDoubleMatrixMagnitude$(EXEEXT) \
 	testFloatMatrixMagnitude$(EXEEXT)
-subdir = matrixOperations/magnitude
+subdir = src/c/matrixOperations/magnitude
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -227,11 +227,11 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixMagnitude_la_CFLAGS = -I $(top_builddir)/type \
-						-I $(top_builddir)/matrixOperations/includes \
-						-I $(top_builddir)/auxiliaryFunctions/includes \
-						-I $(top_builddir)/operations/includes \
-						-I $(top_builddir)/elementaryFunctions/includes
+libMatrixMagnitude_la_CFLAGS = -I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes \
+				-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+				-I $(top_builddir)/src/c/operations/includes \
+				-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixMagnitude.la
@@ -246,22 +246,22 @@ libMatrixMagnitude_la_SOURCES = $(HEAD) \
 					zmagns.c \
 					zmagna.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-				$(top_builddir)/type/libFloatComplex.la \
-				$(top_builddir)/operations/addition/libAddition.la \
-				$(top_builddir)/lib/lapack/libscilapack.la \
-				$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-				$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-				$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-				$(top_builddir)/operations/multiplication/libMultiplication.la \
-				$(top_builddir)/operations/addition/libAddition.la \
-				libMatrixMagnitude.la
-
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/elementaryFunctions/includes
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			libMatrixMagnitude.la
+
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 testDoubleMatrixMagnitude_SOURCES = testDoubleMagnitude.c
 testDoubleMatrixMagnitude_LDADD = $(check_LDADD)
@@ -282,9 +282,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/magnitude/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/magnitude/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/magnitude/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/magnitude/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/multiplication/Makefile.am b/src/c/matrixOperations/multiplication/Makefile.am
index fc852e4f..7fa8d9ed 100644
--- a/src/c/matrixOperations/multiplication/Makefile.am
+++ b/src/c/matrixOperations/multiplication/Makefile.am
@@ -10,9 +10,9 @@
 ##
 ##
 
-libMatrixMultiplication_la_CFLAGS =	-I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes \
-					-I $(top_builddir)/operations/includes
+libMatrixMultiplication_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+					-I $(top_builddir)/src/c/matrixOperations/includes \
+					-I $(top_builddir)/src/c/operations/includes
 
 instdir = $(top_builddir)/lib
 
@@ -28,16 +28,16 @@ libMatrixMultiplication_la_SOURCES = 	$(HEAD) \
 
 check_PROGRAMS = 	testMatrixMultiplication
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			libMatrixMultiplication.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/operations/includes
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/operations/includes
 
 testMatrixMultiplication_SOURCES = 	testFloatMatrixMultiplication.c \
 					testDoubleMatrixMultiplication.c
diff --git a/src/c/matrixOperations/multiplication/Makefile.in b/src/c/matrixOperations/multiplication/Makefile.in
index d7508381..d085c8f6 100644
--- a/src/c/matrixOperations/multiplication/Makefile.in
+++ b/src/c/matrixOperations/multiplication/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testMatrixMultiplication$(EXEEXT)
 TESTS = testMatrixMultiplication$(EXEEXT)
-subdir = matrixOperations/multiplication
+subdir = src/c/matrixOperations/multiplication
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -211,9 +211,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixMultiplication_la_CFLAGS = -I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes \
-					-I $(top_builddir)/operations/includes
+libMatrixMultiplication_la_CFLAGS = -I $(top_builddir)/src/c/type \
+					-I $(top_builddir)/src/c/matrixOperations/includes \
+					-I $(top_builddir)/src/c/operations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixMultiplication.la
@@ -224,16 +224,16 @@ libMatrixMultiplication_la_SOURCES = $(HEAD) \
 					cmulma.c \
 					zmulma.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			libMatrixMultiplication.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/operations/includes
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/operations/includes
 
 testMatrixMultiplication_SOURCES = testFloatMatrixMultiplication.c \
 					testDoubleMatrixMultiplication.c
@@ -253,9 +253,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/multiplication/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/multiplication/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/multiplication/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/multiplication/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/ones/Makefile.am b/src/c/matrixOperations/ones/Makefile.am
index d5865e2b..8f1419c8 100644
--- a/src/c/matrixOperations/ones/Makefile.am
+++ b/src/c/matrixOperations/ones/Makefile.am
@@ -10,8 +10,8 @@
 ##
 ##
 
-libMatrixOnes_la_CFLAGS =	-I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes
+libMatrixOnes_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes
 
 
 instdir = $(top_builddir)/lib
@@ -28,12 +28,12 @@ libMatrixOnes_la_SOURCES = 	$(HEAD) \
 
 check_PROGRAMS = 	testMatrixOnes
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
 			libMatrixOnes.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes
 
 testMatrixOnes_SOURCES = testMatrixOnes.c
 testMatrixOnes_LDADD = $(check_LDADD)
diff --git a/src/c/matrixOperations/ones/Makefile.in b/src/c/matrixOperations/ones/Makefile.in
index 6ae85ab4..0cf7c9eb 100644
--- a/src/c/matrixOperations/ones/Makefile.in
+++ b/src/c/matrixOperations/ones/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testMatrixOnes$(EXEEXT)
 TESTS = testMatrixOnes$(EXEEXT)
-subdir = matrixOperations/ones
+subdir = src/c/matrixOperations/ones
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -202,8 +202,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixOnes_la_CFLAGS = -I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes
+libMatrixOnes_la_CFLAGS = -I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixOnes.la
@@ -214,12 +214,12 @@ libMatrixOnes_la_SOURCES = $(HEAD) \
 				conesa.c \
 				zonesa.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
 			libMatrixOnes.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes
 
 testMatrixOnes_SOURCES = testMatrixOnes.c
 testMatrixOnes_LDADD = $(check_LDADD)
@@ -237,9 +237,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/ones/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/ones/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/ones/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/ones/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/powm/Makefile.am b/src/c/matrixOperations/powm/Makefile.am
index d3ce9bc7..5f6ef268 100644
--- a/src/c/matrixOperations/powm/Makefile.am
+++ b/src/c/matrixOperations/powm/Makefile.am
@@ -10,12 +10,12 @@
 ##
 ##
 
-libMatrixPow_la_CFLAGS =	-I $(top_builddir)/type \
-					-I $(top_builddir)/includes \
-					-I $(top_builddir)/operations/includes\
-					-I $(top_builddir)/auxiliaryFunctions/includes\
-					-I $(top_builddir)/elementaryFunctions/includes\
-					-I $(top_builddir)/matrixOperations/includes
+libMatrixPow_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/includes \
+				-I $(top_builddir)/src/c/operations/includes\
+				-I $(top_builddir)/src/c/auxiliaryFunctions/includes\
+				-I $(top_builddir)/src/c/elementaryFunctions/includes\
+				-I $(top_builddir)/src/c/matrixOperations/includes
 
 
 instdir = $(top_builddir)/lib
@@ -32,48 +32,48 @@ libMatrixPow_la_SOURCES = 	$(HEAD) \
 
 check_PROGRAMS = 	testDoubleMatrixPow	testFloatMatrixPow
 
-check_LDADD =	$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/sign/libSign.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/auxiliaryFunctions/frexp/libFrexp.la \
-			$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/exp/libExp.la \
-			$(top_builddir)/elementaryFunctions/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/pow/libPow.la \
-			$(top_builddir)/elementaryFunctions/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la\
-			$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-			$(top_builddir)/elementaryFunctions/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-			$(top_builddir)/matrixOperations/spec2/libSpec2.la \
-			$(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \
-			$(top_builddir)/matrixOperations/inversion/libMatrixInversion.la \
-			$(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \
-			$(top_builddir)/matrixOperations/cat/libMatrixConcatenation.la \
-			$(top_builddir)/matrixOperations/expm/libMatrixExponential.la \
-			$(top_builddir)/matrixOperations/logm/libLogm.la \
-			$(top_builddir)/matrixOperations/infiniteNorm/libMatrixInfiniteNorm.la \
-			$(top_builddir)/matrixOperations/eye/libMatrixEye.la \
-			$(top_builddir)/matrixOperations/multiplication/libMatrixMultiplication.la \
-			$(top_builddir)/matrixOperations/division/libMatrixDivision.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/operations/subtraction/libSubtraction.la \
-			$(top_builddir)/operations/division/libDivision.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/frexp/libFrexp.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp/libExp.la \
+			$(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/pow/libPow.la \
+			$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la\
+			$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+			$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+			$(top_builddir)/src/c/matrixOperations/spec2/libSpec2.la \
+			$(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \
+			$(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la \
+			$(top_builddir)/src/c/matrixOperations/transpose/libMatrixTranspose.la \
+			$(top_builddir)/src/c/matrixOperations/cat/libMatrixConcatenation.la \
+			$(top_builddir)/src/c/matrixOperations/expm/libMatrixExponential.la \
+			$(top_builddir)/src/c/matrixOperations/logm/libLogm.la \
+			$(top_builddir)/src/c/matrixOperations/infiniteNorm/libMatrixInfiniteNorm.la \
+			$(top_builddir)/src/c/matrixOperations/eye/libMatrixEye.la \
+			$(top_builddir)/src/c/matrixOperations/multiplication/libMatrixMultiplication.la \
+			$(top_builddir)/src/c/matrixOperations/division/libMatrixDivision.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/operations/subtraction/libSubtraction.la \
+			$(top_builddir)/src/c/operations/division/libDivision.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
 			libMatrixPow.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes\
-			-I $(top_builddir)/elementaryFunctions/includes\
-			-I $(top_builddir)/operations/includes\
-			-I $(top_builddir)/matrixOperations/includes
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes\
+			-I $(top_builddir)/src/c/elementaryFunctions/includes\
+			-I $(top_builddir)/src/c/operations/includes\
+			-I $(top_builddir)/src/c/matrixOperations/includes
 
 testDoubleMatrixPow_SOURCES = testDoublePowm.c
 testDoubleMatrixPow_LDADD = $(check_LDADD)
diff --git a/src/c/matrixOperations/powm/Makefile.in b/src/c/matrixOperations/powm/Makefile.in
index 736d2367..f6ea1e43 100644
--- a/src/c/matrixOperations/powm/Makefile.in
+++ b/src/c/matrixOperations/powm/Makefile.in
@@ -35,7 +35,7 @@ host_triplet = @host@
 check_PROGRAMS = testDoubleMatrixPow$(EXEEXT) \
 	testFloatMatrixPow$(EXEEXT)
 TESTS = testDoubleMatrixPow$(EXEEXT) testFloatMatrixPow$(EXEEXT)
-subdir = matrixOperations/powm
+subdir = src/c/matrixOperations/powm
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -215,12 +215,12 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixPow_la_CFLAGS = -I $(top_builddir)/type \
-					-I $(top_builddir)/includes \
-					-I $(top_builddir)/operations/includes\
-					-I $(top_builddir)/auxiliaryFunctions/includes\
-					-I $(top_builddir)/elementaryFunctions/includes\
-					-I $(top_builddir)/matrixOperations/includes
+libMatrixPow_la_CFLAGS = -I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/includes \
+				-I $(top_builddir)/src/c/operations/includes\
+				-I $(top_builddir)/src/c/auxiliaryFunctions/includes\
+				-I $(top_builddir)/src/c/elementaryFunctions/includes\
+				-I $(top_builddir)/src/c/matrixOperations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixPow.la
@@ -231,48 +231,48 @@ libMatrixPow_la_SOURCES = $(HEAD) \
 				cpowma.c\
 				zpowma.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/sign/libSign.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/auxiliaryFunctions/frexp/libFrexp.la \
-			$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/exp/libExp.la \
-			$(top_builddir)/elementaryFunctions/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/pow/libPow.la \
-			$(top_builddir)/elementaryFunctions/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la\
-			$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-			$(top_builddir)/elementaryFunctions/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-			$(top_builddir)/matrixOperations/spec2/libSpec2.la \
-			$(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \
-			$(top_builddir)/matrixOperations/inversion/libMatrixInversion.la \
-			$(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \
-			$(top_builddir)/matrixOperations/cat/libMatrixConcatenation.la \
-			$(top_builddir)/matrixOperations/expm/libMatrixExponential.la \
-			$(top_builddir)/matrixOperations/logm/libLogm.la \
-			$(top_builddir)/matrixOperations/infiniteNorm/libMatrixInfiniteNorm.la \
-			$(top_builddir)/matrixOperations/eye/libMatrixEye.la \
-			$(top_builddir)/matrixOperations/multiplication/libMatrixMultiplication.la \
-			$(top_builddir)/matrixOperations/division/libMatrixDivision.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/operations/subtraction/libSubtraction.la \
-			$(top_builddir)/operations/division/libDivision.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/frexp/libFrexp.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp/libExp.la \
+			$(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/pow/libPow.la \
+			$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la\
+			$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+			$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+			$(top_builddir)/src/c/matrixOperations/spec2/libSpec2.la \
+			$(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \
+			$(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la \
+			$(top_builddir)/src/c/matrixOperations/transpose/libMatrixTranspose.la \
+			$(top_builddir)/src/c/matrixOperations/cat/libMatrixConcatenation.la \
+			$(top_builddir)/src/c/matrixOperations/expm/libMatrixExponential.la \
+			$(top_builddir)/src/c/matrixOperations/logm/libLogm.la \
+			$(top_builddir)/src/c/matrixOperations/infiniteNorm/libMatrixInfiniteNorm.la \
+			$(top_builddir)/src/c/matrixOperations/eye/libMatrixEye.la \
+			$(top_builddir)/src/c/matrixOperations/multiplication/libMatrixMultiplication.la \
+			$(top_builddir)/src/c/matrixOperations/division/libMatrixDivision.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/operations/subtraction/libSubtraction.la \
+			$(top_builddir)/src/c/operations/division/libDivision.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
 			libMatrixPow.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes\
-			-I $(top_builddir)/elementaryFunctions/includes\
-			-I $(top_builddir)/operations/includes\
-			-I $(top_builddir)/matrixOperations/includes
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes\
+			-I $(top_builddir)/src/c/elementaryFunctions/includes\
+			-I $(top_builddir)/src/c/operations/includes\
+			-I $(top_builddir)/src/c/matrixOperations/includes
 
 testDoubleMatrixPow_SOURCES = testDoublePowm.c
 testDoubleMatrixPow_LDADD = $(check_LDADD)
@@ -293,9 +293,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/powm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/powm/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/powm/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/powm/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/spec/Makefile.am b/src/c/matrixOperations/spec/Makefile.am
index 031647b3..90dbd0aa 100644
--- a/src/c/matrixOperations/spec/Makefile.am
+++ b/src/c/matrixOperations/spec/Makefile.am
@@ -10,11 +10,11 @@
 ##
 ##
 
-libSpec_la_CFLAGS =	-I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes \
-				-I $(top_builddir)/operations/includes \
-				-I $(top_builddir)/elementaryFunctions/includes\
-				-I $(top_builddir)/auxiliaryFunctions/includes
+libSpec_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes\
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 
 instdir = $(top_builddir)/lib
@@ -24,39 +24,39 @@ pkglib_LTLIBRARIES = libSpec.la
 HEAD = ../includes/spec.h
 
 libSpec_la_SOURCES = 	$(HEAD) \
-					sspeca.c \
-					dspeca.c \
-					cspeca.c \
-					zspeca.c
-					
-					
-############					
-##  CHECK			
+			sspeca.c \
+			dspeca.c \
+			cspeca.c \
+			zspeca.c
+
+
+############
+##  CHECK
 ############
 
 
 check_PROGRAMS = 	testDoubleSpec    testFloatSpec
 
-check_LDADD =	$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
-			$(top_builddir)/auxiliaryFunctions/sign/libSign.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/matrixOperations/inversion/libMatrixInversion.la\
-			$(top_builddir)/matrixOperations/zeros/libMatrixZeros.la\
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la\
+			$(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la\
 			libSpec.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/elementaryFunctions/includes\
-			-I $(top_builddir)/auxiliaryFunctions/includes 
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes\
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 testDoubleSpec_SOURCES = testDoubleSpec.c
 testDoubleSpec_LDADD = $(check_LDADD)
diff --git a/src/c/matrixOperations/spec/Makefile.in b/src/c/matrixOperations/spec/Makefile.in
index b48b1a3d..6692146e 100644
--- a/src/c/matrixOperations/spec/Makefile.in
+++ b/src/c/matrixOperations/spec/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testDoubleSpec$(EXEEXT) testFloatSpec$(EXEEXT)
 TESTS = testDoubleSpec$(EXEEXT) testFloatSpec$(EXEEXT)
-subdir = matrixOperations/spec
+subdir = src/c/matrixOperations/spec
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -209,41 +209,41 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libSpec_la_CFLAGS = -I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes \
-				-I $(top_builddir)/operations/includes \
-				-I $(top_builddir)/elementaryFunctions/includes\
-				-I $(top_builddir)/auxiliaryFunctions/includes
+libSpec_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes\
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libSpec.la
 HEAD = ../includes/spec.h
 libSpec_la_SOURCES = $(HEAD) \
-					sspeca.c \
-					dspeca.c \
-					cspeca.c \
-					zspeca.c
-
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
-			$(top_builddir)/auxiliaryFunctions/sign/libSign.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/matrixOperations/inversion/libMatrixInversion.la\
-			$(top_builddir)/matrixOperations/zeros/libMatrixZeros.la\
+			sspeca.c \
+			dspeca.c \
+			cspeca.c \
+			zspeca.c
+
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la\
+			$(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la\
 			libSpec.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/elementaryFunctions/includes\
-			-I $(top_builddir)/auxiliaryFunctions/includes 
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes\
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 testDoubleSpec_SOURCES = testDoubleSpec.c
 testDoubleSpec_LDADD = $(check_LDADD)
@@ -264,9 +264,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/spec/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/spec/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/spec/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/spec/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/spec2/Makefile.am b/src/c/matrixOperations/spec2/Makefile.am
index 3166815d..5a357fa5 100644
--- a/src/c/matrixOperations/spec2/Makefile.am
+++ b/src/c/matrixOperations/spec2/Makefile.am
@@ -10,11 +10,11 @@
 ##
 ##
 
-libSpec2_la_CFLAGS =	-I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes \
-				-I $(top_builddir)/operations/includes \
-				-I $(top_builddir)/elementaryFunctions/includes\
-				-I $(top_builddir)/auxiliaryFunctions/includes
+libSpec2_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes\
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 
 instdir = $(top_builddir)/lib
@@ -24,39 +24,39 @@ pkglib_LTLIBRARIES = libSpec2.la
 HEAD = ../includes/spec.h
 
 libSpec2_la_SOURCES = 	$(HEAD) \
-					sspec2a.c \
-					dspec2a.c \
-					cspec2a.c \
-					zspec2a.c
-					
-					
-############					
-##  CHECK			
+				sspec2a.c \
+				dspec2a.c \
+				cspec2a.c \
+				zspec2a.c
+
+
+############
+##  CHECK
 ############
 
 
 check_PROGRAMS = 	testDoubleSpec2    testFloatSpec2
 
-check_LDADD =	$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
-			$(top_builddir)/auxiliaryFunctions/sign/libSign.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/matrixOperations/inversion/libMatrixInversion.la\
-			$(top_builddir)/matrixOperations/zeros/libMatrixZeros.la\
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la\
+			$(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la\
 			libSpec2.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/elementaryFunctions/includes\
-			-I $(top_builddir)/auxiliaryFunctions/includes 
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes\
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 testDoubleSpec2_SOURCES = testDoubleSpec2.c
 testDoubleSpec2_LDADD = $(check_LDADD)
diff --git a/src/c/matrixOperations/spec2/Makefile.in b/src/c/matrixOperations/spec2/Makefile.in
index cd5158e6..4df23233 100644
--- a/src/c/matrixOperations/spec2/Makefile.in
+++ b/src/c/matrixOperations/spec2/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testDoubleSpec2$(EXEEXT) testFloatSpec2$(EXEEXT)
 TESTS = testDoubleSpec2$(EXEEXT) testFloatSpec2$(EXEEXT)
-subdir = matrixOperations/spec2
+subdir = src/c/matrixOperations/spec2
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -211,41 +211,41 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libSpec2_la_CFLAGS = -I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes \
-				-I $(top_builddir)/operations/includes \
-				-I $(top_builddir)/elementaryFunctions/includes\
-				-I $(top_builddir)/auxiliaryFunctions/includes
+libSpec2_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes\
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libSpec2.la
 HEAD = ../includes/spec.h
 libSpec2_la_SOURCES = $(HEAD) \
-					sspec2a.c \
-					dspec2a.c \
-					cspec2a.c \
-					zspec2a.c
-
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/conj/libConj.la \
-			$(top_builddir)/auxiliaryFunctions/sign/libSign.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/matrixOperations/inversion/libMatrixInversion.la\
-			$(top_builddir)/matrixOperations/zeros/libMatrixZeros.la\
+				sspec2a.c \
+				dspec2a.c \
+				cspec2a.c \
+				zspec2a.c
+
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la\
+			$(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la\
 			libSpec2.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/elementaryFunctions/includes\
-			-I $(top_builddir)/auxiliaryFunctions/includes 
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes\
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 testDoubleSpec2_SOURCES = testDoubleSpec2.c
 testDoubleSpec2_LDADD = $(check_LDADD)
@@ -266,9 +266,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/spec2/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/spec2/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/spec2/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/spec2/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/squaredMagnitude/Makefile.am b/src/c/matrixOperations/squaredMagnitude/Makefile.am
index 1b2ff334..0430097f 100644
--- a/src/c/matrixOperations/squaredMagnitude/Makefile.am
+++ b/src/c/matrixOperations/squaredMagnitude/Makefile.am
@@ -10,8 +10,8 @@
 ##
 ##
 
-libMatrixSquaredMagnitude_la_CFLAGS =	-I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes
+libMatrixSquaredMagnitude_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+					-I $(top_builddir)/src/c/matrixOperations/includes
 
 instdir = $(top_builddir)/lib
 
@@ -28,27 +28,27 @@ libMatrixSquaredMagnitude_la_SOURCES = 	$(HEAD) \
 					csquMagna.c \
 					zsquMagns.c \
 					zsquMagna.c
-					
+
 #############
 ##  CHECK  ##
 #############
 
 check_PROGRAMS = 	testDoubleMatrixSquaredMagnitude   testFloatMatrixSquaredMagnitude
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/matrixOperations/magnitude/libMatrixMagnitude.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/matrixOperations/magnitude/libMatrixMagnitude.la \
 			libMatrixSquaredMagnitude.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/elementaryFunctions/includes
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 testDoubleMatrixSquaredMagnitude_SOURCES = 	testDoubleSquaredMagnitude.c
 testDoubleMatrixSquaredMagnitude_LDADD   = 	$(check_LDADD)
diff --git a/src/c/matrixOperations/squaredMagnitude/Makefile.in b/src/c/matrixOperations/squaredMagnitude/Makefile.in
index 6e4b839c..003efeec 100644
--- a/src/c/matrixOperations/squaredMagnitude/Makefile.in
+++ b/src/c/matrixOperations/squaredMagnitude/Makefile.in
@@ -36,7 +36,7 @@ check_PROGRAMS = testDoubleMatrixSquaredMagnitude$(EXEEXT) \
 	testFloatMatrixSquaredMagnitude$(EXEEXT)
 TESTS = testDoubleMatrixSquaredMagnitude$(EXEEXT) \
 	testFloatMatrixSquaredMagnitude$(EXEEXT)
-subdir = matrixOperations/squaredMagnitude
+subdir = src/c/matrixOperations/squaredMagnitude
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -226,8 +226,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixSquaredMagnitude_la_CFLAGS = -I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes
+libMatrixSquaredMagnitude_la_CFLAGS = -I $(top_builddir)/src/c/type \
+					-I $(top_builddir)/src/c/matrixOperations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixSquaredMagnitude.la
@@ -242,20 +242,20 @@ libMatrixSquaredMagnitude_la_SOURCES = $(HEAD) \
 					zsquMagns.c \
 					zsquMagna.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/matrixOperations/magnitude/libMatrixMagnitude.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
+			$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/matrixOperations/magnitude/libMatrixMagnitude.la \
 			libMatrixSquaredMagnitude.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes \
-			-I $(top_builddir)/elementaryFunctions/includes
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 testDoubleMatrixSquaredMagnitude_SOURCES = testDoubleSquaredMagnitude.c
 testDoubleMatrixSquaredMagnitude_LDADD = $(check_LDADD)
@@ -276,9 +276,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/squaredMagnitude/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/squaredMagnitude/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/squaredMagnitude/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/squaredMagnitude/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/trace/Makefile.am b/src/c/matrixOperations/trace/Makefile.am
index 041245cd..ddf72b80 100644
--- a/src/c/matrixOperations/trace/Makefile.am
+++ b/src/c/matrixOperations/trace/Makefile.am
@@ -10,8 +10,8 @@
 ##
 ##
 
-libMatrixTrace_la_CFLAGS =	-I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes
+libMatrixTrace_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes
 
 instdir = $(top_builddir)/lib
 
@@ -20,19 +20,19 @@ pkglib_LTLIBRARIES = libMatrixTrace.la
 HEAD = ../includes/matrixTrace.h
 
 libMatrixTrace_la_SOURCES = 	$(HEAD) \
-					stracea.c \
-					dtracea.c \
-					ctracea.c \
-					ztracea.c
+				stracea.c \
+				dtracea.c \
+				ctracea.c \
+				ztracea.c
 
 check_PROGRAMS = 	testMatrixTrace
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
 			libMatrixTrace.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes
 
 testMatrixTrace_SOURCES = testMatrixTrace.c
 testMatrixTrace_LDADD = $(check_LDADD)
diff --git a/src/c/matrixOperations/trace/Makefile.in b/src/c/matrixOperations/trace/Makefile.in
index 4f512f19..f90f3910 100644
--- a/src/c/matrixOperations/trace/Makefile.in
+++ b/src/c/matrixOperations/trace/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testMatrixTrace$(EXEEXT)
 TESTS = testMatrixTrace$(EXEEXT)
-subdir = matrixOperations/trace
+subdir = src/c/matrixOperations/trace
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -204,24 +204,24 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixTrace_la_CFLAGS = -I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes
+libMatrixTrace_la_CFLAGS = -I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixTrace.la
 HEAD = ../includes/matrixTrace.h
 libMatrixTrace_la_SOURCES = $(HEAD) \
-					stracea.c \
-					dtracea.c \
-					ctracea.c \
-					ztracea.c
+				stracea.c \
+				dtracea.c \
+				ctracea.c \
+				ztracea.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
 			libMatrixTrace.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes
 
 testMatrixTrace_SOURCES = testMatrixTrace.c
 testMatrixTrace_LDADD = $(check_LDADD)
@@ -239,9 +239,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/trace/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/trace/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/trace/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/trace/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/transpose/Makefile.am b/src/c/matrixOperations/transpose/Makefile.am
index 8c8bf385..11341058 100644
--- a/src/c/matrixOperations/transpose/Makefile.am
+++ b/src/c/matrixOperations/transpose/Makefile.am
@@ -10,8 +10,8 @@
 ##
 ##
 
-libMatrixTranspose_la_CFLAGS =	-I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes
+libMatrixTranspose_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes
 
 instdir = $(top_builddir)/lib
 
@@ -27,9 +27,9 @@ libMatrixTranspose_la_SOURCES = 	$(HEAD) \
 
 check_PROGRAMS = 	testMatrixTranspose
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
 			libMatrixTranspose.la
 
 check_INCLUDES =	-I $(top_builddir)/type \
diff --git a/src/c/matrixOperations/transpose/Makefile.in b/src/c/matrixOperations/transpose/Makefile.in
index 05653766..c3eebc2c 100644
--- a/src/c/matrixOperations/transpose/Makefile.in
+++ b/src/c/matrixOperations/transpose/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testMatrixTranspose$(EXEEXT)
 TESTS = testMatrixTranspose$(EXEEXT)
-subdir = matrixOperations/transpose
+subdir = src/c/matrixOperations/transpose
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -209,8 +209,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixTranspose_la_CFLAGS = -I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes
+libMatrixTranspose_la_CFLAGS = -I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixTranspose.la
@@ -221,9 +221,9 @@ libMatrixTranspose_la_SOURCES = $(HEAD) \
 					ctransposea.c \
 					ztransposea.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/lib/blas/libsciblas.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
 			libMatrixTranspose.la
 
 check_INCLUDES = -I $(top_builddir)/type \
@@ -245,9 +245,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/transpose/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/transpose/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/transpose/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/transpose/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/matrixOperations/zeros/Makefile.am b/src/c/matrixOperations/zeros/Makefile.am
index 3faeee86..7d310afa 100644
--- a/src/c/matrixOperations/zeros/Makefile.am
+++ b/src/c/matrixOperations/zeros/Makefile.am
@@ -10,8 +10,8 @@
 ##
 ##
 
-libMatrixZeros_la_CFLAGS =	-I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes
+libMatrixZeros_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes
 
 
 instdir = $(top_builddir)/lib
@@ -28,12 +28,12 @@ libMatrixZeros_la_SOURCES = 	$(HEAD) \
 
 check_PROGRAMS = 	testMatrixZeros
 
-check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
+check_LDADD =		$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
 			libMatrixZeros.la
 
-check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes
+check_INCLUDES =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes
 
 testMatrixZeros_SOURCES = testMatrixZeros.c
 testMatrixZeros_LDADD = $(check_LDADD)
diff --git a/src/c/matrixOperations/zeros/Makefile.in b/src/c/matrixOperations/zeros/Makefile.in
index e8a8047d..722b350d 100644
--- a/src/c/matrixOperations/zeros/Makefile.in
+++ b/src/c/matrixOperations/zeros/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testMatrixZeros$(EXEEXT)
 TESTS = testMatrixZeros$(EXEEXT)
-subdir = matrixOperations/zeros
+subdir = src/c/matrixOperations/zeros
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -204,8 +204,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libMatrixZeros_la_CFLAGS = -I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes
+libMatrixZeros_la_CFLAGS = -I $(top_builddir)/src/c/type \
+				-I $(top_builddir)/src/c/matrixOperations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixZeros.la
@@ -216,12 +216,12 @@ libMatrixZeros_la_SOURCES = $(HEAD) \
 				czerosa.c \
 				zzerosa.c
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
 			libMatrixZeros.la
 
-check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes
+check_INCLUDES = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/matrixOperations/includes
 
 testMatrixZeros_SOURCES = testMatrixZeros.c
 testMatrixZeros_LDADD = $(check_LDADD)
@@ -239,9 +239,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  matrixOperations/zeros/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/matrixOperations/zeros/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  matrixOperations/zeros/Makefile
+	  $(AUTOMAKE) --foreign  src/c/matrixOperations/zeros/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \