Update Autotools with new PATH

53 files changed, 1197 insertions, 1195 deletions

diff --git a/src/c/elementaryFunctions/Makefile.in b/src/c/elementaryFunctions/Makefile.in
index 4f2bdde3..be4a216c 100644
--- a/src/c/elementaryFunctions/Makefile.in
+++ b/src/c/elementaryFunctions/Makefile.in
@@ -31,7 +31,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = elementaryFunctions
+subdir = src/c/elementaryFunctions
 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 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/acos/Makefile.am b/src/c/elementaryFunctions/acos/Makefile.am
index 51b7756f..24935987 100644
--- a/src/c/elementaryFunctions/acos/Makefile.am
+++ b/src/c/elementaryFunctions/acos/Makefile.am
@@ -10,9 +10,9 @@
 ##
 ##
 
-libAcos_la_CFLAGS =	-I $(top_builddir)/type \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes
+libAcos_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 
@@ -37,23 +37,23 @@ HEAD	=	../includes/acos.h \
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
 			-I $(top_builddir)/includes \
-			-I $(top_builddir)/type
+			-I $(top_builddir)/src/c/type
 
-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/acos/libAcos.la \
-			$(top_builddir)/elementaryFunctions/atan/libAtan.la \
-			$(top_builddir)/elementaryFunctions/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.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/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/c/elementaryFunctions/acos/libAcos.la \
+			$(top_builddir)/src/c/elementaryFunctions/atan/libAtan.la \
+			$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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 \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testRealsAcos testCplxAcos
diff --git a/src/c/elementaryFunctions/acos/Makefile.in b/src/c/elementaryFunctions/acos/Makefile.in
index 61c810db..cf95caf1 100644
--- a/src/c/elementaryFunctions/acos/Makefile.in
+++ b/src/c/elementaryFunctions/acos/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testRealsAcos$(EXEEXT) testCplxAcos$(EXEEXT)
 TESTS = testRealsAcos$(EXEEXT) testCplxAcos$(EXEEXT)
-subdir = elementaryFunctions/acos
+subdir = src/c/elementaryFunctions/acos
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -64,19 +64,19 @@ libAcos_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_testCplxAcos_OBJECTS = testCplxAcos-testCplxAcos.$(OBJEXT)
 testCplxAcos_OBJECTS = $(am_testCplxAcos_OBJECTS)
-am__DEPENDENCIES_1 = $(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/acos/libAcos.la \
-	$(top_builddir)/elementaryFunctions/atan/libAtan.la \
-	$(top_builddir)/elementaryFunctions/log/libLog.la \
-	$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-	$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-	$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-	$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-	$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-	$(top_builddir)/operations/multiplication/libMultiplication.la
+am__DEPENDENCIES_1 = $(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/acos/libAcos.la \
+	$(top_builddir)/src/c/elementaryFunctions/atan/libAtan.la \
+	$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+	$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+	$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+	$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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
 testCplxAcos_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testCplxAcos_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testCplxAcos_CFLAGS) \
@@ -224,9 +224,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libAcos_la_CFLAGS = -I $(top_builddir)/type \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes
+libAcos_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libAcos.la
@@ -248,23 +248,23 @@ HEAD = ../includes/acos.h \
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
 			-I $(top_builddir)/includes \
-			-I $(top_builddir)/type
-
-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/acos/libAcos.la \
-			$(top_builddir)/elementaryFunctions/atan/libAtan.la \
-			$(top_builddir)/elementaryFunctions/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+			-I $(top_builddir)/src/c/type
+
+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/acos/libAcos.la \
+			$(top_builddir)/src/c/elementaryFunctions/atan/libAtan.la \
+			$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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 \
 			@LIBMATH@
 
 
@@ -290,9 +290,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/acos/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/acos/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/acos/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/acos/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/acosh/Makefile.am b/src/c/elementaryFunctions/acosh/Makefile.am
index 53136350..467f2ffb 100644
--- a/src/c/elementaryFunctions/acosh/Makefile.am
+++ b/src/c/elementaryFunctions/acosh/Makefile.am
@@ -11,7 +11,7 @@
 ##
 
 libAcosh_la_CFLAGS =	-I ../../type \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
 			-I ../includes
 
 instdir = $(top_builddir)/lib
@@ -35,26 +35,25 @@ HEAD	=	../includes/acosh.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/type
-			
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-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/acos/libAcos.la \
-			$(top_builddir)/elementaryFunctions/acosh/libAcosh.la \
-			$(top_builddir)/elementaryFunctions/atan/libAtan.la \
-			$(top_builddir)/elementaryFunctions/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/auxiliaryFunctions/isnan/libIsnan.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/acos/libAcos.la \
+			$(top_builddir)/src/c/elementaryFunctions/acosh/libAcosh.la \
+			$(top_builddir)/src/c/elementaryFunctions/atan/libAtan.la \
+			$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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/auxiliaryFunctions/isnan/libIsnan.la \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatAcosh testDoubleAcosh
@@ -66,8 +65,8 @@ TESTS		=	testFloatAcosh testDoubleAcosh
 #
 testFloatAcosh_SOURCES = 	testAcosh.h testFloatAcosh.c
 testFloatAcosh_CFLAGS  =	$(check_INCLUDES)
-testFloatAcosh_LDADD	  =	$(check_LDADD)
+testFloatAcosh_LDADD =		$(check_LDADD)
 
 testDoubleAcosh_SOURCES = 	testAcosh.h testDoubleAcosh.c
 testDoubleAcosh_CFLAGS  =	$(check_INCLUDES)
-testDoubleAcosh_LDADD	  =	$(check_LDADD)
+testDoubleAcosh_LDADD =		$(check_LDADD)
diff --git a/src/c/elementaryFunctions/acosh/Makefile.in b/src/c/elementaryFunctions/acosh/Makefile.in
index 1d34bc7c..794ee33c 100644
--- a/src/c/elementaryFunctions/acosh/Makefile.in
+++ b/src/c/elementaryFunctions/acosh/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatAcosh$(EXEEXT) testDoubleAcosh$(EXEEXT)
 TESTS = testFloatAcosh$(EXEEXT) testDoubleAcosh$(EXEEXT)
-subdir = elementaryFunctions/acosh
+subdir = src/c/elementaryFunctions/acosh
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -66,21 +66,21 @@ libAcosh_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 am_testDoubleAcosh_OBJECTS =  \
 	testDoubleAcosh-testDoubleAcosh.$(OBJEXT)
 testDoubleAcosh_OBJECTS = $(am_testDoubleAcosh_OBJECTS)
-am__DEPENDENCIES_1 = $(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/acos/libAcos.la \
-	$(top_builddir)/elementaryFunctions/acosh/libAcosh.la \
-	$(top_builddir)/elementaryFunctions/atan/libAtan.la \
-	$(top_builddir)/elementaryFunctions/log/libLog.la \
-	$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-	$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-	$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-	$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-	$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-	$(top_builddir)/operations/multiplication/libMultiplication.la \
-	$(top_builddir)/auxiliaryFunctions/isnan/libIsnan.la
+am__DEPENDENCIES_1 = $(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/acos/libAcos.la \
+	$(top_builddir)/src/c/elementaryFunctions/acosh/libAcosh.la \
+	$(top_builddir)/src/c/elementaryFunctions/atan/libAtan.la \
+	$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+	$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+	$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+	$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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/auxiliaryFunctions/isnan/libIsnan.la
 testDoubleAcosh_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleAcosh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleAcosh_CFLAGS) \
@@ -229,7 +229,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libAcosh_la_CFLAGS = -I ../../type \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
 			-I ../includes
 
 instdir = $(top_builddir)/lib
@@ -249,25 +249,25 @@ HEAD = ../includes/acosh.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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/acos/libAcos.la \
-			$(top_builddir)/elementaryFunctions/acosh/libAcosh.la \
-			$(top_builddir)/elementaryFunctions/atan/libAtan.la \
-			$(top_builddir)/elementaryFunctions/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/auxiliaryFunctions/isnan/libIsnan.la \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/acos/libAcos.la \
+			$(top_builddir)/src/c/elementaryFunctions/acosh/libAcosh.la \
+			$(top_builddir)/src/c/elementaryFunctions/atan/libAtan.la \
+			$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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/auxiliaryFunctions/isnan/libIsnan.la \
 			@LIBMATH@
 
 
@@ -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  elementaryFunctions/acosh/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/acosh/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/acosh/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/acosh/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/asin/Makefile.am b/src/c/elementaryFunctions/asin/Makefile.am
index edc2c130..0a8ab05a 100644
--- a/src/c/elementaryFunctions/asin/Makefile.am
+++ b/src/c/elementaryFunctions/asin/Makefile.am
@@ -10,9 +10,9 @@
 ##
 ##
 
-libAsin_la_CFLAGS =	-I $(top_builddir)/type \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes
+libAsin_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 
@@ -36,24 +36,24 @@ HEAD	=	../includes/asin.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-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)/lib/blas/libsciblas.la \
-			$(top_builddir)/elementaryFunctions/asin/libAsin.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/atan/libAtan.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.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/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/fortran/blas/libsciblas.la \
+			$(top_builddir)/src/c/elementaryFunctions/asin/libAsin.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/atan/libAtan.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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 \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatAsin testDoubleAsin
diff --git a/src/c/elementaryFunctions/asin/Makefile.in b/src/c/elementaryFunctions/asin/Makefile.in
index d6f0882a..5ec9fbdc 100644
--- a/src/c/elementaryFunctions/asin/Makefile.in
+++ b/src/c/elementaryFunctions/asin/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatAsin$(EXEEXT) testDoubleAsin$(EXEEXT)
 TESTS = testFloatAsin$(EXEEXT) testDoubleAsin$(EXEEXT)
-subdir = elementaryFunctions/asin
+subdir = src/c/elementaryFunctions/asin
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -64,20 +64,20 @@ libAsin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_testDoubleAsin_OBJECTS = testDoubleAsin-testDoubleAsin.$(OBJEXT)
 testDoubleAsin_OBJECTS = $(am_testDoubleAsin_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \
-	$(top_builddir)/type/libFloatComplex.la \
-	$(top_builddir)/operations/addition/libAddition.la \
-	$(top_builddir)/lib/lapack/libscilapack.la \
-	$(top_builddir)/lib/blas/libsciblas.la \
-	$(top_builddir)/elementaryFunctions/asin/libAsin.la \
-	$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-	$(top_builddir)/elementaryFunctions/log/libLog.la \
-	$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-	$(top_builddir)/elementaryFunctions/atan/libAtan.la \
-	$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-	$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-	$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-	$(top_builddir)/operations/multiplication/libMultiplication.la
+am__DEPENDENCIES_1 = $(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/fortran/blas/libsciblas.la \
+	$(top_builddir)/src/c/elementaryFunctions/asin/libAsin.la \
+	$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+	$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+	$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+	$(top_builddir)/src/c/elementaryFunctions/atan/libAtan.la \
+	$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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
 testDoubleAsin_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleAsin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleAsin_CFLAGS) \
@@ -225,9 +225,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libAsin_la_CFLAGS = -I $(top_builddir)/type \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes
+libAsin_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libAsin.la
@@ -246,24 +246,24 @@ HEAD = ../includes/asin.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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)/lib/blas/libsciblas.la \
-			$(top_builddir)/elementaryFunctions/asin/libAsin.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/atan/libAtan.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/fortran/blas/libsciblas.la \
+			$(top_builddir)/src/c/elementaryFunctions/asin/libAsin.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/atan/libAtan.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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 \
 			@LIBMATH@
 
 
@@ -289,9 +289,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/asin/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/asin/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/asin/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/asin/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/asinh/Makefile.am b/src/c/elementaryFunctions/asinh/Makefile.am
index ed27672b..33f4436e 100644
--- a/src/c/elementaryFunctions/asinh/Makefile.am
+++ b/src/c/elementaryFunctions/asinh/Makefile.am
@@ -34,23 +34,23 @@ HEAD	=	../includes/asinh.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-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/asinh/libAsinh.la \
-			$(top_builddir)/elementaryFunctions/asin/libAsin.la \
-			$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/atan/libAtan.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.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/lapack/libscilapack.la \
+			$(top_builddir)/src/c/elementaryFunctions/asinh/libAsinh.la \
+			$(top_builddir)/src/c/elementaryFunctions/asin/libAsin.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/atan/libAtan.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatAsinh testDoubleAsinh
@@ -61,9 +61,9 @@ TESTS		=	testFloatAsinh testDoubleAsinh
 # -*- Hyperbolic ArcSine Tests -*-
 #
 testFloatAsinh_SOURCES = 	testAsinh.h testFloatAsinh.c
-testFloatAsinh_CFLAGS =	$(check_INCLUDES)
-testFloatAsinh_LDADD	=	$(check_LDADD)
+testFloatAsinh_CFLAGS =		$(check_INCLUDES)
+testFloatAsinh_LDADD =		$(check_LDADD)
 
 testDoubleAsinh_SOURCES = 	testAsinh.h testDoubleAsinh.c
 testDoubleAsinh_CFLAGS =	$(check_INCLUDES)
-testDoubleAsinh_LDADD	=	$(check_LDADD)
+testDoubleAsinh_LDADD =		$(check_LDADD)
diff --git a/src/c/elementaryFunctions/asinh/Makefile.in b/src/c/elementaryFunctions/asinh/Makefile.in
index cacc3f3e..146891aa 100644
--- a/src/c/elementaryFunctions/asinh/Makefile.in
+++ b/src/c/elementaryFunctions/asinh/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatAsinh$(EXEEXT) testDoubleAsinh$(EXEEXT)
 TESTS = testFloatAsinh$(EXEEXT) testDoubleAsinh$(EXEEXT)
-subdir = elementaryFunctions/asinh
+subdir = src/c/elementaryFunctions/asinh
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -66,20 +66,20 @@ libAsinh_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 am_testDoubleAsinh_OBJECTS =  \
 	testDoubleAsinh-testDoubleAsinh.$(OBJEXT)
 testDoubleAsinh_OBJECTS = $(am_testDoubleAsinh_OBJECTS)
-am__DEPENDENCIES_1 = $(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/asinh/libAsinh.la \
-	$(top_builddir)/elementaryFunctions/asin/libAsin.la \
-	$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-	$(top_builddir)/elementaryFunctions/log/libLog.la \
-	$(top_builddir)/elementaryFunctions/atan/libAtan.la \
-	$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-	$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-	$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-	$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-	$(top_builddir)/operations/multiplication/libMultiplication.la
+am__DEPENDENCIES_1 = $(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/asinh/libAsinh.la \
+	$(top_builddir)/src/c/elementaryFunctions/asin/libAsin.la \
+	$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+	$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+	$(top_builddir)/src/c/elementaryFunctions/atan/libAtan.la \
+	$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+	$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la \
+	$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+	$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+	$(top_builddir)/src/c/operations/multiplication/libMultiplication.la
 testDoubleAsinh_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleAsinh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleAsinh_CFLAGS) \
@@ -247,23 +247,23 @@ HEAD = ../includes/asinh.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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/asinh/libAsinh.la \
-			$(top_builddir)/elementaryFunctions/asin/libAsin.la \
-			$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/atan/libAtan.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/asinh/libAsinh.la \
+			$(top_builddir)/src/c/elementaryFunctions/asin/libAsin.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/atan/libAtan.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			@LIBMATH@
 
 
@@ -289,9 +289,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/asinh/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/asinh/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/asinh/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/asinh/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/atan/Makefile.am b/src/c/elementaryFunctions/atan/Makefile.am
index 2e4abca1..5c090404 100644
--- a/src/c/elementaryFunctions/atan/Makefile.am
+++ b/src/c/elementaryFunctions/atan/Makefile.am
@@ -10,9 +10,9 @@
 ##
 ##
 
-libAtan_la_CFLAGS =	-I $(top_builddir)/type \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes
+libAtan_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 
 instdir = $(top_builddir)/lib
@@ -36,19 +36,19 @@ HEAD	=	../includes/atan.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-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)/elementaryFunctions/atan/libAtan.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.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/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/atan/libAtan.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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 \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatAtan testDoubleAtan
diff --git a/src/c/elementaryFunctions/atan/Makefile.in b/src/c/elementaryFunctions/atan/Makefile.in
index d9d0a875..20f45ee3 100644
--- a/src/c/elementaryFunctions/atan/Makefile.in
+++ b/src/c/elementaryFunctions/atan/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatAtan$(EXEEXT) testDoubleAtan$(EXEEXT)
 TESTS = testFloatAtan$(EXEEXT) testDoubleAtan$(EXEEXT)
-subdir = elementaryFunctions/atan
+subdir = src/c/elementaryFunctions/atan
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -64,16 +64,16 @@ libAtan_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_testDoubleAtan_OBJECTS = testDoubleAtan-testDoubleAtan.$(OBJEXT)
 testDoubleAtan_OBJECTS = $(am_testDoubleAtan_OBJECTS)
-am__DEPENDENCIES_1 = $(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)/elementaryFunctions/atan/libAtan.la \
-	$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-	$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-	$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-	$(top_builddir)/operations/multiplication/libMultiplication.la
+am__DEPENDENCIES_1 = $(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/elementaryFunctions/atan/libAtan.la \
+	$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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
 testDoubleAtan_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleAtan_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleAtan_CFLAGS) \
@@ -221,9 +221,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libAtan_la_CFLAGS = -I $(top_builddir)/type \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes
+libAtan_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libAtan.la
@@ -242,19 +242,19 @@ HEAD = ../includes/atan.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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)/elementaryFunctions/atan/libAtan.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/elementaryFunctions/atan/libAtan.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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 \
 			@LIBMATH@
 
 
@@ -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  elementaryFunctions/atan/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/atan/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/atan/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/atan/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/atan2/Makefile.am b/src/c/elementaryFunctions/atan2/Makefile.am
index bafbc9ee..becea0f4 100644
--- a/src/c/elementaryFunctions/atan2/Makefile.am
+++ b/src/c/elementaryFunctions/atan2/Makefile.am
@@ -11,7 +11,7 @@
 ##
 
 libAtan2_la_CFLAGS =	-I ../../type \
-		-I ../includes
+			-I ../includes
 
 instdir = $(top_builddir)/lib
 
@@ -30,20 +30,20 @@ HEAD	=	../includes/atan2.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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/atan/libAtan.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/atan2/libAtan2.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la 
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/atan/libAtan.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/atan2/libAtan2.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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
 
 check_PROGRAMS	= 	testAtan2
 
@@ -53,6 +53,6 @@ TESTS		=	testAtan2
 # -*- ArcTangeant2  Tests -*-
 #
 testAtan2_SOURCES = 	testAtan2.c
-testAtan2_CFLAGS =		$(check_INCLUDES)
-testAtan2_LDADD =		$(check_LDADD)
+testAtan2_CFLAGS =	$(check_INCLUDES)
+testAtan2_LDADD =	$(check_LDADD)
 
diff --git a/src/c/elementaryFunctions/atan2/Makefile.in b/src/c/elementaryFunctions/atan2/Makefile.in
index 71df69a7..08d8ad38 100644
--- a/src/c/elementaryFunctions/atan2/Makefile.in
+++ b/src/c/elementaryFunctions/atan2/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testAtan2$(EXEEXT)
 TESTS = testAtan2$(EXEEXT)
-subdir = elementaryFunctions/atan2
+subdir = src/c/elementaryFunctions/atan2
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -203,7 +203,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libAtan2_la_CFLAGS = -I ../../type \
-		-I ../includes
+			-I ../includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libAtan2.la
@@ -218,20 +218,20 @@ HEAD = ../includes/atan2.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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/atan/libAtan.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/atan2/libAtan2.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la 
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/atan/libAtan.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/atan2/libAtan2.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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
 
 
 #
@@ -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  elementaryFunctions/atan2/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/atan2/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/atan2/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/atan2/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/atanh/Makefile.am b/src/c/elementaryFunctions/atanh/Makefile.am
index c057f9ba..df8ec211 100644
--- a/src/c/elementaryFunctions/atanh/Makefile.am
+++ b/src/c/elementaryFunctions/atanh/Makefile.am
@@ -11,7 +11,7 @@
 ##
 
 libAtanh_la_CFLAGS =	-I ../../type \
-		-I ../includes
+			-I ../includes
 
 instdir = $(top_builddir)/lib
 
@@ -34,22 +34,22 @@ HEAD	=	../includes/atanh.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-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/atan/libAtan.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/atanh/libAtanh.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/auxiliaryFunctions/isnan/libIsnan.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/atan/libAtan.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/atanh/libAtanh.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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/auxiliaryFunctions/isnan/libIsnan.la \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatAtanh testDoubleAtanh
diff --git a/src/c/elementaryFunctions/atanh/Makefile.in b/src/c/elementaryFunctions/atanh/Makefile.in
index ec069559..8e244bbe 100644
--- a/src/c/elementaryFunctions/atanh/Makefile.in
+++ b/src/c/elementaryFunctions/atanh/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatAtanh$(EXEEXT) testDoubleAtanh$(EXEEXT)
 TESTS = testFloatAtanh$(EXEEXT) testDoubleAtanh$(EXEEXT)
-subdir = elementaryFunctions/atanh
+subdir = src/c/elementaryFunctions/atanh
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -66,18 +66,18 @@ libAtanh_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 am_testDoubleAtanh_OBJECTS =  \
 	testDoubleAtanh-testDoubleAtanh.$(OBJEXT)
 testDoubleAtanh_OBJECTS = $(am_testDoubleAtanh_OBJECTS)
-am__DEPENDENCIES_1 = $(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/atan/libAtan.la \
-	$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-	$(top_builddir)/elementaryFunctions/atanh/libAtanh.la \
-	$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-	$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-	$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-	$(top_builddir)/operations/multiplication/libMultiplication.la \
-	$(top_builddir)/auxiliaryFunctions/isnan/libIsnan.la
+am__DEPENDENCIES_1 = $(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/atan/libAtan.la \
+	$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+	$(top_builddir)/src/c/elementaryFunctions/atanh/libAtanh.la \
+	$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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/auxiliaryFunctions/isnan/libIsnan.la
 testDoubleAtanh_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleAtanh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleAtanh_CFLAGS) \
@@ -226,7 +226,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libAtanh_la_CFLAGS = -I ../../type \
-		-I ../includes
+			-I ../includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libAtanh.la
@@ -245,22 +245,22 @@ HEAD = ../includes/atanh.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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/atan/libAtan.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/elementaryFunctions/atanh/libAtanh.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/auxiliaryFunctions/isnan/libIsnan.la \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/atan/libAtan.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/elementaryFunctions/atanh/libAtanh.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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/auxiliaryFunctions/isnan/libIsnan.la \
 			@LIBMATH@
 
 
@@ -286,9 +286,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/atanh/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/atanh/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/atanh/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/atanh/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/ceil/Makefile.am b/src/c/elementaryFunctions/ceil/Makefile.am
index b3bd3853..26723826 100644
--- a/src/c/elementaryFunctions/ceil/Makefile.am
+++ b/src/c/elementaryFunctions/ceil/Makefile.am
@@ -12,8 +12,8 @@
 
 
 
-libCeil_la_CFLAGS =	-I $(top_builddir)/type \
-				-I $(top_builddir)/elementaryFunctions/includes
+libCeil_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 
@@ -36,17 +36,17 @@ SRC	=	sceils.c \
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-				-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-check_LDADD	=	$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/ceil/libCeil.la \
+check_LDADD	=	$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/ceil/libCeil.la \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatCeil testDoubleCeil
 
-TESTS		=		testFloatCeil testDoubleCeil
+TESTS		=	testFloatCeil testDoubleCeil
 
 #
 # -*- Ceil Tests -*-
diff --git a/src/c/elementaryFunctions/ceil/Makefile.in b/src/c/elementaryFunctions/ceil/Makefile.in
index c5ad9ee1..1a4c4878 100644
--- a/src/c/elementaryFunctions/ceil/Makefile.in
+++ b/src/c/elementaryFunctions/ceil/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatCeil$(EXEEXT) testDoubleCeil$(EXEEXT)
 TESTS = testFloatCeil$(EXEEXT) testDoubleCeil$(EXEEXT)
-subdir = elementaryFunctions/ceil
+subdir = src/c/elementaryFunctions/ceil
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -64,9 +64,9 @@ libCeil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_testDoubleCeil_OBJECTS = testDoubleCeil-testDoubleCeil.$(OBJEXT)
 testDoubleCeil_OBJECTS = $(am_testDoubleCeil_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \
-	$(top_builddir)/type/libFloatComplex.la \
-	$(top_builddir)/elementaryFunctions/ceil/libCeil.la
+am__DEPENDENCIES_1 = $(top_builddir)/src/c/type/libDoubleComplex.la \
+	$(top_builddir)/src/c/type/libFloatComplex.la \
+	$(top_builddir)/src/c/elementaryFunctions/ceil/libCeil.la
 testDoubleCeil_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleCeil_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleCeil_CFLAGS) \
@@ -214,8 +214,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libCeil_la_CFLAGS = -I $(top_builddir)/type \
-				-I $(top_builddir)/elementaryFunctions/includes
+libCeil_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libCeil.la
@@ -234,12 +234,12 @@ SRC = sceils.c \
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-				-I $(top_builddir)/type
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/ceil/libCeil.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/ceil/libCeil.la \
 			@LIBMATH@
 
 
@@ -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  elementaryFunctions/ceil/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/ceil/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/ceil/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/ceil/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/cos/Makefile.am b/src/c/elementaryFunctions/cos/Makefile.am
index c1a4b016..ad772a66 100644
--- a/src/c/elementaryFunctions/cos/Makefile.am
+++ b/src/c/elementaryFunctions/cos/Makefile.am
@@ -12,8 +12,8 @@
 
 
 
-libCos_la_CFLAGS =	-I $(top_builddir)/type \
-			-I $(top_builddir)/elementaryFunctions/includes
+libCos_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 
@@ -36,22 +36,22 @@ SRC	=	scoss.c \
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-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/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-			$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-			$(top_builddir)/elementaryFunctions/exp/libExp.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 \
+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/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+			$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp/libExp.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 \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatCos testDoubleCos
diff --git a/src/c/elementaryFunctions/cos/Makefile.in b/src/c/elementaryFunctions/cos/Makefile.in
index 9c58cbb1..c63b92fe 100644
--- a/src/c/elementaryFunctions/cos/Makefile.in
+++ b/src/c/elementaryFunctions/cos/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatCos$(EXEEXT) testDoubleCos$(EXEEXT)
 TESTS = testFloatCos$(EXEEXT) testDoubleCos$(EXEEXT)
-subdir = elementaryFunctions/cos
+subdir = src/c/elementaryFunctions/cos
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -64,19 +64,19 @@ libCos_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_testDoubleCos_OBJECTS = testDoubleCos-testDoubleCos.$(OBJEXT)
 testDoubleCos_OBJECTS = $(am_testDoubleCos_OBJECTS)
-am__DEPENDENCIES_1 = $(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/cos/libCos.la \
-	$(top_builddir)/elementaryFunctions/sin/libSin.la \
-	$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-	$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-	$(top_builddir)/elementaryFunctions/exp/libExp.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
+am__DEPENDENCIES_1 = $(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/cos/libCos.la \
+	$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+	$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+	$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+	$(top_builddir)/src/c/elementaryFunctions/exp/libExp.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
 testDoubleCos_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleCos_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleCos_CFLAGS) \
@@ -224,8 +224,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libCos_la_CFLAGS = -I $(top_builddir)/type \
-			-I $(top_builddir)/elementaryFunctions/includes
+libCos_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libCos.la
@@ -244,22 +244,22 @@ SRC = scoss.c \
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-			$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-			$(top_builddir)/elementaryFunctions/exp/libExp.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 \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+			$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp/libExp.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 \
 			@LIBMATH@
 
 
@@ -285,9 +285,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/cos/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/cos/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/cos/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/cos/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/cosh/Makefile.am b/src/c/elementaryFunctions/cosh/Makefile.am
index 04aeab04..6661eac5 100644
--- a/src/c/elementaryFunctions/cosh/Makefile.am
+++ b/src/c/elementaryFunctions/cosh/Makefile.am
@@ -10,9 +10,9 @@
 ##
 ##
 
-libCosh_la_CFLAGS =	-I $(top_builddir)/type \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/elementaryFunctions/includes
+libCosh_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 
@@ -35,22 +35,22 @@ HEAD	=	../includes/cosh.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-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/cosh/libCosh.la \
-			$(top_builddir)/elementaryFunctions/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-			$(top_builddir)/elementaryFunctions/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/exp/libExp.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 \
+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/cosh/libCosh.la \
+			$(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+			$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp/libExp.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 \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatCosh testDoubleCosh
diff --git a/src/c/elementaryFunctions/cosh/Makefile.in b/src/c/elementaryFunctions/cosh/Makefile.in
index a6074a9f..ebea61a7 100644
--- a/src/c/elementaryFunctions/cosh/Makefile.in
+++ b/src/c/elementaryFunctions/cosh/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatCosh$(EXEEXT) testDoubleCosh$(EXEEXT)
 TESTS = testFloatCosh$(EXEEXT) testDoubleCosh$(EXEEXT)
-subdir = elementaryFunctions/cosh
+subdir = src/c/elementaryFunctions/cosh
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -64,19 +64,19 @@ libCosh_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_testDoubleCosh_OBJECTS = testDoubleCosh-testDoubleCosh.$(OBJEXT)
 testDoubleCosh_OBJECTS = $(am_testDoubleCosh_OBJECTS)
-am__DEPENDENCIES_1 = $(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/cosh/libCosh.la \
-	$(top_builddir)/elementaryFunctions/cos/libCos.la \
-	$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-	$(top_builddir)/elementaryFunctions/sin/libSin.la \
-	$(top_builddir)/elementaryFunctions/exp/libExp.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
+am__DEPENDENCIES_1 = $(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/cosh/libCosh.la \
+	$(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \
+	$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+	$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+	$(top_builddir)/src/c/elementaryFunctions/exp/libExp.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
 testDoubleCosh_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleCosh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleCosh_CFLAGS) \
@@ -224,9 +224,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libCosh_la_CFLAGS = -I $(top_builddir)/type \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/elementaryFunctions/includes
+libCosh_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libCosh.la
@@ -245,22 +245,22 @@ HEAD = ../includes/cosh.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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/cosh/libCosh.la \
-			$(top_builddir)/elementaryFunctions/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-			$(top_builddir)/elementaryFunctions/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/exp/libExp.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 \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/cosh/libCosh.la \
+			$(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+			$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp/libExp.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 \
 			@LIBMATH@
 
 
@@ -286,9 +286,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/cosh/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/cosh/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/cosh/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/cosh/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/exp/Makefile.am b/src/c/elementaryFunctions/exp/Makefile.am
index 81be5552..f8c73aa5 100644
--- a/src/c/elementaryFunctions/exp/Makefile.am
+++ b/src/c/elementaryFunctions/exp/Makefile.am
@@ -11,7 +11,7 @@
 ##
 
 libExp_la_CFLAGS =	-I ../../type \
-		-I ../includes
+			-I ../includes
 
 instdir = $(top_builddir)/lib
 
@@ -34,22 +34,22 @@ HEAD	=	../includes/exp.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-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/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-			$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-			$(top_builddir)/elementaryFunctions/exp/libExp.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 \
+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/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+			$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp/libExp.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 \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatExp testDoubleExp
diff --git a/src/c/elementaryFunctions/exp/Makefile.in b/src/c/elementaryFunctions/exp/Makefile.in
index 2e2fa5cc..47da93a4 100644
--- a/src/c/elementaryFunctions/exp/Makefile.in
+++ b/src/c/elementaryFunctions/exp/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatExp$(EXEEXT) testDoubleExp$(EXEEXT)
 TESTS = testFloatExp$(EXEEXT) testDoubleExp$(EXEEXT)
-subdir = elementaryFunctions/exp
+subdir = src/c/elementaryFunctions/exp
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -64,19 +64,19 @@ libExp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_testDoubleExp_OBJECTS = testDoubleExp-testDoubleExp.$(OBJEXT)
 testDoubleExp_OBJECTS = $(am_testDoubleExp_OBJECTS)
-am__DEPENDENCIES_1 = $(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/cos/libCos.la \
-	$(top_builddir)/elementaryFunctions/sin/libSin.la \
-	$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-	$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-	$(top_builddir)/elementaryFunctions/exp/libExp.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
+am__DEPENDENCIES_1 = $(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/cos/libCos.la \
+	$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+	$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+	$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+	$(top_builddir)/src/c/elementaryFunctions/exp/libExp.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
 testDoubleExp_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleExp_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleExp_CFLAGS) \
@@ -225,7 +225,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libExp_la_CFLAGS = -I ../../type \
-		-I ../includes
+			-I ../includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libExp.la
@@ -244,22 +244,22 @@ HEAD = ../includes/exp.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-			$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-			$(top_builddir)/elementaryFunctions/exp/libExp.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 \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+			$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp/libExp.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 \
 			@LIBMATH@
 
 testFloatExp_SOURCES = testExp.h testFloatExp.c
@@ -281,9 +281,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/exp/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/exp/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/exp/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/exp/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/exp10/Makefile.am b/src/c/elementaryFunctions/exp10/Makefile.am
index 32ac9d56..bc258bbd 100644
--- a/src/c/elementaryFunctions/exp10/Makefile.am
+++ b/src/c/elementaryFunctions/exp10/Makefile.am
@@ -11,7 +11,7 @@
 ##
 
 libExp10_la_CFLAGS =	-I ../../type \
-			-I $(top_builddir)/operations/includes \
+			-I $(top_builddir)/src/c/operations/includes \
 			-I ../includes
 
 instdir = $(top_builddir)/lib
@@ -35,27 +35,27 @@ HEAD	=	../includes/exp10.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-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/pow/libPow.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/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-			$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-			$(top_builddir)/elementaryFunctions/exp10/libExp10.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 \
+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/pow/libPow.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/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+			$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp10/libExp10.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 \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatExp10 testDoubleExp10
diff --git a/src/c/elementaryFunctions/exp10/Makefile.in b/src/c/elementaryFunctions/exp10/Makefile.in
index 9ad8adc4..5d274b4e 100644
--- a/src/c/elementaryFunctions/exp10/Makefile.in
+++ b/src/c/elementaryFunctions/exp10/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatExp10$(EXEEXT) testDoubleExp10$(EXEEXT)
 TESTS = testFloatExp10$(EXEEXT) testDoubleExp10$(EXEEXT)
-subdir = elementaryFunctions/exp10
+subdir = src/c/elementaryFunctions/exp10
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -66,24 +66,24 @@ libExp10_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 am_testDoubleExp10_OBJECTS =  \
 	testDoubleExp10-testDoubleExp10.$(OBJEXT)
 testDoubleExp10_OBJECTS = $(am_testDoubleExp10_OBJECTS)
-am__DEPENDENCIES_1 = $(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/pow/libPow.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/cos/libCos.la \
-	$(top_builddir)/elementaryFunctions/sin/libSin.la \
-	$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-	$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-	$(top_builddir)/elementaryFunctions/exp10/libExp10.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
+am__DEPENDENCIES_1 = $(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/pow/libPow.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/cos/libCos.la \
+	$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+	$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+	$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+	$(top_builddir)/src/c/elementaryFunctions/exp10/libExp10.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
 testDoubleExp10_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleExp10_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleExp10_CFLAGS) \
@@ -232,7 +232,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libExp10_la_CFLAGS = -I ../../type \
-			-I $(top_builddir)/operations/includes \
+			-I $(top_builddir)/src/c/operations/includes \
 			-I ../includes
 
 instdir = $(top_builddir)/lib
@@ -252,27 +252,27 @@ HEAD = ../includes/exp10.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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/pow/libPow.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/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-			$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-			$(top_builddir)/elementaryFunctions/exp10/libExp10.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 \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/pow/libPow.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/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+			$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp10/libExp10.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 \
 			@LIBMATH@
 
 testFloatExp10_SOURCES = testExp10.h testFloatExp10.c
@@ -294,9 +294,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/exp10/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/exp10/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/exp10/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/exp10/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/fix/Makefile.am b/src/c/elementaryFunctions/fix/Makefile.am
index fd186a3c..a1d1cfdf 100644
--- a/src/c/elementaryFunctions/fix/Makefile.am
+++ b/src/c/elementaryFunctions/fix/Makefile.am
@@ -12,8 +12,8 @@
 
 
 
-libFix_la_CFLAGS =	-I $(top_builddir)/type \
-				-I $(top_builddir)/elementaryFunctions/includes
+libFix_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 
@@ -36,17 +36,17 @@ SRC	=	sfixs.c \
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-				-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-check_LDADD	=	$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/fix/libFix.la \
+check_LDADD	=	$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/fix/libFix.la \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatFix testDoubleFix
 
-TESTS		=		testFloatFix testDoubleFix
+TESTS		=	testFloatFix testDoubleFix
 
 #
 # -*- Fix Tests -*-
diff --git a/src/c/elementaryFunctions/fix/Makefile.in b/src/c/elementaryFunctions/fix/Makefile.in
index 817ddea3..a4a7c368 100644
--- a/src/c/elementaryFunctions/fix/Makefile.in
+++ b/src/c/elementaryFunctions/fix/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatFix$(EXEEXT) testDoubleFix$(EXEEXT)
 TESTS = testFloatFix$(EXEEXT) testDoubleFix$(EXEEXT)
-subdir = elementaryFunctions/fix
+subdir = src/c/elementaryFunctions/fix
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -64,9 +64,9 @@ libFix_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_testDoubleFix_OBJECTS = testDoubleFix-testDoubleFix.$(OBJEXT)
 testDoubleFix_OBJECTS = $(am_testDoubleFix_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \
-	$(top_builddir)/type/libFloatComplex.la \
-	$(top_builddir)/elementaryFunctions/fix/libFix.la
+am__DEPENDENCIES_1 = $(top_builddir)/src/c/type/libDoubleComplex.la \
+	$(top_builddir)/src/c/type/libFloatComplex.la \
+	$(top_builddir)/src/c/elementaryFunctions/fix/libFix.la
 testDoubleFix_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleFix_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleFix_CFLAGS) \
@@ -214,8 +214,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libFix_la_CFLAGS = -I $(top_builddir)/type \
-				-I $(top_builddir)/elementaryFunctions/includes
+libFix_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libFix.la
@@ -234,12 +234,12 @@ SRC = sfixs.c \
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-				-I $(top_builddir)/type
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/fix/libFix.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/fix/libFix.la \
 			@LIBMATH@
 
 
@@ -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  elementaryFunctions/fix/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/fix/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/fix/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/fix/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/floor/Makefile.am b/src/c/elementaryFunctions/floor/Makefile.am
index f16295ef..469d2c1a 100644
--- a/src/c/elementaryFunctions/floor/Makefile.am
+++ b/src/c/elementaryFunctions/floor/Makefile.am
@@ -12,8 +12,8 @@
 
 
 
-libFloor_la_CFLAGS =	-I $(top_builddir)/type \
-				-I $(top_builddir)/elementaryFunctions/includes
+libFloor_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 
@@ -36,17 +36,17 @@ SRC	=	sfloors.c \
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-				-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-check_LDADD	=	$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/floor/libFloor.la \
+check_LDADD	=	$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/floor/libFloor.la \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatFloor testDoubleFloor
 
-TESTS		=		testFloatFloor testDoubleFloor
+TESTS		=	testFloatFloor testDoubleFloor
 
 #
 # -*- Floor Tests -*-
diff --git a/src/c/elementaryFunctions/floor/Makefile.in b/src/c/elementaryFunctions/floor/Makefile.in
index c295bd05..929612fb 100644
--- a/src/c/elementaryFunctions/floor/Makefile.in
+++ b/src/c/elementaryFunctions/floor/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatFloor$(EXEEXT) testDoubleFloor$(EXEEXT)
 TESTS = testFloatFloor$(EXEEXT) testDoubleFloor$(EXEEXT)
-subdir = elementaryFunctions/floor
+subdir = src/c/elementaryFunctions/floor
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -66,9 +66,9 @@ libFloor_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 am_testDoubleFloor_OBJECTS =  \
 	testDoubleFloor-testDoubleFloor.$(OBJEXT)
 testDoubleFloor_OBJECTS = $(am_testDoubleFloor_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \
-	$(top_builddir)/type/libFloatComplex.la \
-	$(top_builddir)/elementaryFunctions/floor/libFloor.la
+am__DEPENDENCIES_1 = $(top_builddir)/src/c/type/libDoubleComplex.la \
+	$(top_builddir)/src/c/type/libFloatComplex.la \
+	$(top_builddir)/src/c/elementaryFunctions/floor/libFloor.la
 testDoubleFloor_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleFloor_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleFloor_CFLAGS) \
@@ -216,8 +216,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libFloor_la_CFLAGS = -I $(top_builddir)/type \
-				-I $(top_builddir)/elementaryFunctions/includes
+libFloor_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libFloor.la
@@ -236,12 +236,12 @@ SRC = sfloors.c \
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-				-I $(top_builddir)/type
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/floor/libFloor.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/floor/libFloor.la \
 			@LIBMATH@
 
 
@@ -267,9 +267,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/floor/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/floor/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/floor/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/floor/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/int/Makefile.am b/src/c/elementaryFunctions/int/Makefile.am
index be36d93d..be6e6617 100644
--- a/src/c/elementaryFunctions/int/Makefile.am
+++ b/src/c/elementaryFunctions/int/Makefile.am
@@ -12,8 +12,8 @@
 
 
 
-libInt_la_CFLAGS =	-I $(top_builddir)/type \
-				-I $(top_builddir)/elementaryFunctions/includes
+libInt_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 
@@ -36,18 +36,18 @@ SRC	=	sints.c \
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-				-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-check_LDADD	=	$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/int/libInt.la \
-			$(top_builddir)/elementaryFunctions/fix/libFix.la \
+check_LDADD	=	$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/int/libInt.la \
+			$(top_builddir)/src/c/elementaryFunctions/fix/libFix.la \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatInt testDoubleInt
 
-TESTS		=		testFloatInt testDoubleInt
+TESTS		=	testFloatInt testDoubleInt
 
 #
 # -*- Int Tests -*-
diff --git a/src/c/elementaryFunctions/int/Makefile.in b/src/c/elementaryFunctions/int/Makefile.in
index edce4de6..0e9db6fc 100644
--- a/src/c/elementaryFunctions/int/Makefile.in
+++ b/src/c/elementaryFunctions/int/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatInt$(EXEEXT) testDoubleInt$(EXEEXT)
 TESTS = testFloatInt$(EXEEXT) testDoubleInt$(EXEEXT)
-subdir = elementaryFunctions/int
+subdir = src/c/elementaryFunctions/int
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -64,10 +64,10 @@ libInt_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_testDoubleInt_OBJECTS = testDoubleInt-testDoubleInt.$(OBJEXT)
 testDoubleInt_OBJECTS = $(am_testDoubleInt_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \
-	$(top_builddir)/type/libFloatComplex.la \
-	$(top_builddir)/elementaryFunctions/int/libInt.la \
-	$(top_builddir)/elementaryFunctions/fix/libFix.la
+am__DEPENDENCIES_1 = $(top_builddir)/src/c/type/libDoubleComplex.la \
+	$(top_builddir)/src/c/type/libFloatComplex.la \
+	$(top_builddir)/src/c/elementaryFunctions/int/libInt.la \
+	$(top_builddir)/src/c/elementaryFunctions/fix/libFix.la
 testDoubleInt_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleInt_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleInt_CFLAGS) \
@@ -215,8 +215,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libInt_la_CFLAGS = -I $(top_builddir)/type \
-				-I $(top_builddir)/elementaryFunctions/includes
+libInt_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libInt.la
@@ -235,13 +235,13 @@ SRC = sints.c \
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-				-I $(top_builddir)/type
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/int/libInt.la \
-			$(top_builddir)/elementaryFunctions/fix/libFix.la \
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/int/libInt.la \
+			$(top_builddir)/src/c/elementaryFunctions/fix/libFix.la \
 			@LIBMATH@
 
 
@@ -267,9 +267,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/int/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/int/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/int/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/int/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/lnp1m1/Makefile.am b/src/c/elementaryFunctions/lnp1m1/Makefile.am
index 27478fa3..16cd3465 100644
--- a/src/c/elementaryFunctions/lnp1m1/Makefile.am
+++ b/src/c/elementaryFunctions/lnp1m1/Makefile.am
@@ -10,9 +10,9 @@
 ##
 ##
 
-libLnp1m1_la_CFLAGS =	-I $(top_builddir)/type \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/elementaryFunctions/includes
+libLnp1m1_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 
@@ -23,24 +23,24 @@ libLnp1m1_la_SOURCES =	$(HEAD) $(SRC)
 SRC	=	slnp1m1s.c \
 		dlnp1m1s.c
 
-HEAD	=	$(top_builddir)/elementaryFunctions/includes/lnp1m1.h
+HEAD	=	$(top_builddir)/src/c/elementaryFunctions/includes/lnp1m1.h
 
 ####
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/lnp1m1/libLnp1m1.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatLnp1m1 testDoubleLnp1m1
@@ -49,7 +49,7 @@ TESTS		=	testFloatLnp1m1 testDoubleLnp1m1
 
 testFloatLnp1m1_SOURCES = 	testLnp1m1.h testFloatLnp1m1.c
 testFloatLnp1m1_CFLAGS =	$(check_INCLUDES)
-testFloatLnp1m1_LDADD =	$(check_LDADD)
+testFloatLnp1m1_LDADD =		$(check_LDADD)
 
 testDoubleLnp1m1_SOURCES = 	testLnp1m1.h testDoubleLnp1m1.c
 testDoubleLnp1m1_CFLAGS	=	$(check_INCLUDES)
diff --git a/src/c/elementaryFunctions/lnp1m1/Makefile.in b/src/c/elementaryFunctions/lnp1m1/Makefile.in
index a4708b6f..572a550a 100644
--- a/src/c/elementaryFunctions/lnp1m1/Makefile.in
+++ b/src/c/elementaryFunctions/lnp1m1/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatLnp1m1$(EXEEXT) testDoubleLnp1m1$(EXEEXT)
 TESTS = testFloatLnp1m1$(EXEEXT) testDoubleLnp1m1$(EXEEXT)
-subdir = elementaryFunctions/lnp1m1
+subdir = src/c/elementaryFunctions/lnp1m1
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -63,15 +63,15 @@ libLnp1m1_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 am_testDoubleLnp1m1_OBJECTS =  \
 	testDoubleLnp1m1-testDoubleLnp1m1.$(OBJEXT)
 testDoubleLnp1m1_OBJECTS = $(am_testDoubleLnp1m1_OBJECTS)
-am__DEPENDENCIES_1 = $(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/lnp1m1/libLnp1m1.la \
-	$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-	$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-	$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-	$(top_builddir)/operations/multiplication/libMultiplication.la
+am__DEPENDENCIES_1 = $(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/lnp1m1/libLnp1m1.la \
+	$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+	$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+	$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+	$(top_builddir)/src/c/operations/multiplication/libMultiplication.la
 testDoubleLnp1m1_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleLnp1m1_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleLnp1m1_CFLAGS) \
@@ -220,9 +220,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libLnp1m1_la_CFLAGS = -I $(top_builddir)/type \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/elementaryFunctions/includes
+libLnp1m1_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libLnp1m1.la
@@ -230,23 +230,23 @@ libLnp1m1_la_SOURCES = $(HEAD) $(SRC)
 SRC = slnp1m1s.c \
 		dlnp1m1s.c
 
-HEAD = $(top_builddir)/elementaryFunctions/includes/lnp1m1.h
+HEAD = $(top_builddir)/src/c/elementaryFunctions/includes/lnp1m1.h
 
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/lnp1m1/libLnp1m1.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			@LIBMATH@
 
 testFloatLnp1m1_SOURCES = testLnp1m1.h testFloatLnp1m1.c
@@ -268,9 +268,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/lnp1m1/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/lnp1m1/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/lnp1m1/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/lnp1m1/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/log/Makefile.am b/src/c/elementaryFunctions/log/Makefile.am
index 83d21bf5..6fd45c8b 100644
--- a/src/c/elementaryFunctions/log/Makefile.am
+++ b/src/c/elementaryFunctions/log/Makefile.am
@@ -10,10 +10,10 @@
 ##
 ##
 
-libLog_la_CFLAGS =	-I $(top_builddir)/type \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/operations/includes
+libLog_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/operations/includes
 
 instdir = $(top_builddir)/lib
 
@@ -36,20 +36,20 @@ HEAD	=	$(top_builddir)/elementaryFunctions/includes/log.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-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/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/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/fortran/lapack/libscilapack.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/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatLog testDoubleLog
diff --git a/src/c/elementaryFunctions/log/Makefile.in b/src/c/elementaryFunctions/log/Makefile.in
index 762c4d50..29d8aebf 100644
--- a/src/c/elementaryFunctions/log/Makefile.in
+++ b/src/c/elementaryFunctions/log/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatLog$(EXEEXT) testDoubleLog$(EXEEXT)
 TESTS = testFloatLog$(EXEEXT) testDoubleLog$(EXEEXT)
-subdir = elementaryFunctions/log
+subdir = src/c/elementaryFunctions/log
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -64,17 +64,17 @@ libLog_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_testDoubleLog_OBJECTS = testDoubleLog-testDoubleLog.$(OBJEXT)
 testDoubleLog_OBJECTS = $(am_testDoubleLog_OBJECTS)
-am__DEPENDENCIES_1 = $(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/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/pythag/libPythag.la \
-	$(top_builddir)/operations/multiplication/libMultiplication.la
+am__DEPENDENCIES_1 = $(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/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/pythag/libPythag.la \
+	$(top_builddir)/src/c/operations/multiplication/libMultiplication.la
 testDoubleLog_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleLog_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleLog_CFLAGS) \
@@ -222,10 +222,10 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libLog_la_CFLAGS = -I $(top_builddir)/type \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/operations/includes
+libLog_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/operations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libLog.la
@@ -244,20 +244,20 @@ HEAD = $(top_builddir)/elementaryFunctions/includes/log.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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/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/pythag/libPythag.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/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/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			@LIBMATH@
 
 testFloatLog_SOURCES = testLog.h testFloatLog.c
@@ -279,9 +279,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/log/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/log/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/log/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/log/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/log10/Makefile.am b/src/c/elementaryFunctions/log10/Makefile.am
index 7b6589c8..6e5e0908 100644
--- a/src/c/elementaryFunctions/log10/Makefile.am
+++ b/src/c/elementaryFunctions/log10/Makefile.am
@@ -11,7 +11,7 @@
 ##
 
 libLog10_la_CFLAGS =	-I ../../type \
-		-I ../includes
+			-I ../includes
 
 instdir = $(top_builddir)/lib
 
@@ -34,21 +34,21 @@ HEAD	=	../includes/log10.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-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/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/log10/libLog10.la \
-			$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.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 \
+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/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/log10/libLog10.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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 \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatLog10 testDoubleLog10
diff --git a/src/c/elementaryFunctions/log10/Makefile.in b/src/c/elementaryFunctions/log10/Makefile.in
index 5df2fc7b..c89d5b49 100644
--- a/src/c/elementaryFunctions/log10/Makefile.in
+++ b/src/c/elementaryFunctions/log10/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatLog10$(EXEEXT) testDoubleLog10$(EXEEXT)
 TESTS = testFloatLog10$(EXEEXT) testDoubleLog10$(EXEEXT)
-subdir = elementaryFunctions/log10
+subdir = src/c/elementaryFunctions/log10
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -66,18 +66,18 @@ libLog10_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 am_testDoubleLog10_OBJECTS =  \
 	testDoubleLog10-testDoubleLog10.$(OBJEXT)
 testDoubleLog10_OBJECTS = $(am_testDoubleLog10_OBJECTS)
-am__DEPENDENCIES_1 = $(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/log/libLog.la \
-	$(top_builddir)/elementaryFunctions/log10/libLog10.la \
-	$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-	$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.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
+am__DEPENDENCIES_1 = $(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/log/libLog.la \
+	$(top_builddir)/src/c/elementaryFunctions/log10/libLog10.la \
+	$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+	$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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
 testDoubleLog10_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleLog10_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleLog10_CFLAGS) \
@@ -226,7 +226,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libLog10_la_CFLAGS = -I ../../type \
-		-I ../includes
+			-I ../includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libLog10.la
@@ -245,21 +245,21 @@ HEAD = ../includes/log10.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/log10/libLog10.la \
-			$(top_builddir)/elementaryFunctions/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.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 \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/log10/libLog10.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.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 \
 			@LIBMATH@
 
 
@@ -285,9 +285,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/log10/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/log10/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/log10/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/log10/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/log1p/Makefile.am b/src/c/elementaryFunctions/log1p/Makefile.am
index 6425f19c..d62c071e 100644
--- a/src/c/elementaryFunctions/log1p/Makefile.am
+++ b/src/c/elementaryFunctions/log1p/Makefile.am
@@ -34,20 +34,20 @@ HEAD	=	../includes/log1p.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-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/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/elementaryFunctions/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.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/lapack/libscilapack.la \
+			$(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatLog1p testDoubleLog1p
diff --git a/src/c/elementaryFunctions/log1p/Makefile.in b/src/c/elementaryFunctions/log1p/Makefile.in
index 7fca2483..6e4823b8 100644
--- a/src/c/elementaryFunctions/log1p/Makefile.in
+++ b/src/c/elementaryFunctions/log1p/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatLog1p$(EXEEXT) testDoubleLog1p$(EXEEXT)
 TESTS = testFloatLog1p$(EXEEXT) testDoubleLog1p$(EXEEXT)
-subdir = elementaryFunctions/log1p
+subdir = src/c/elementaryFunctions/log1p
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -66,17 +66,17 @@ libLog1p_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 am_testDoubleLog1p_OBJECTS =  \
 	testDoubleLog1p-testDoubleLog1p.$(OBJEXT)
 testDoubleLog1p_OBJECTS = $(am_testDoubleLog1p_OBJECTS)
-am__DEPENDENCIES_1 = $(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/log1p/libLog1p.la \
-	$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-	$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-	$(top_builddir)/elementaryFunctions/log/libLog.la \
-	$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-	$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-	$(top_builddir)/operations/multiplication/libMultiplication.la
+am__DEPENDENCIES_1 = $(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/log1p/libLog1p.la \
+	$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la \
+	$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+	$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+	$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+	$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+	$(top_builddir)/src/c/operations/multiplication/libMultiplication.la
 testDoubleLog1p_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleLog1p_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleLog1p_CFLAGS) \
@@ -244,20 +244,20 @@ HEAD = ../includes/log1p.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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/log1p/libLog1p.la \
-			$(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/elementaryFunctions/log/libLog.la \
-			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/log1p/libLog1p.la \
+			$(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/elementaryFunctions/log/libLog.la \
+			$(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			@LIBMATH@
 
 
@@ -283,9 +283,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/log1p/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/log1p/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/log1p/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/log1p/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/pow/Makefile.am b/src/c/elementaryFunctions/pow/Makefile.am
index 328a3e91..9b564f92 100644
--- a/src/c/elementaryFunctions/pow/Makefile.am
+++ b/src/c/elementaryFunctions/pow/Makefile.am
@@ -10,9 +10,9 @@
 ##
 ##
 
-libPow_la_CFLAGS =	-I $(top_builddir)/type \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/elementaryFunctions/includes
+libPow_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 
@@ -35,27 +35,27 @@ HEAD	=	../includes/pow.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/type
 
-check_LDADD	=	$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/pow/libPow.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)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/operations/addition/libAddition.la \
+check_LDADD	=	$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/pow/libPow.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/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatPow testDoublePow
diff --git a/src/c/elementaryFunctions/pow/Makefile.in b/src/c/elementaryFunctions/pow/Makefile.in
index 2077cec2..cf91db08 100644
--- a/src/c/elementaryFunctions/pow/Makefile.in
+++ b/src/c/elementaryFunctions/pow/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatPow$(EXEEXT) testDoublePow$(EXEEXT)
 TESTS = testFloatPow$(EXEEXT) testDoublePow$(EXEEXT)
-subdir = elementaryFunctions/pow
+subdir = src/c/elementaryFunctions/pow
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -64,23 +64,24 @@ libPow_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_testDoublePow_OBJECTS = testDoublePow-testDoublePow.$(OBJEXT)
 testDoublePow_OBJECTS = $(am_testDoublePow_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/lib/lapack/libscilapack.la \
-	$(top_builddir)/type/libDoubleComplex.la \
-	$(top_builddir)/type/libFloatComplex.la \
-	$(top_builddir)/elementaryFunctions/pow/libPow.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)/elementaryFunctions/sqrt/libSqrt.la \
-	$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-	$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-	$(top_builddir)/operations/multiplication/libMultiplication.la \
-	$(top_builddir)/operations/addition/libAddition.la
+am__DEPENDENCIES_1 =  \
+	$(top_builddir)/src/fortran/lapack/libscilapack.la \
+	$(top_builddir)/src/c/type/libDoubleComplex.la \
+	$(top_builddir)/src/c/type/libFloatComplex.la \
+	$(top_builddir)/src/c/elementaryFunctions/pow/libPow.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/elementaryFunctions/sqrt/libSqrt.la \
+	$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+	$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+	$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+	$(top_builddir)/src/c/operations/addition/libAddition.la
 testDoublePow_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoublePow_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoublePow_CFLAGS) \
@@ -228,9 +229,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libPow_la_CFLAGS = -I $(top_builddir)/type \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/elementaryFunctions/includes
+libPow_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libPow.la
@@ -249,27 +250,27 @@ HEAD = ../includes/pow.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/type
-
-check_LDADD = $(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/pow/libPow.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)/elementaryFunctions/sqrt/libSqrt.la \
-			$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
-			$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
-			$(top_builddir)/operations/addition/libAddition.la \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/operations/includes \
+			-I $(top_builddir)/src/c/type
+
+check_LDADD = $(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/pow/libPow.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/elementaryFunctions/sqrt/libSqrt.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \
+			$(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
+			$(top_builddir)/src/c/operations/addition/libAddition.la \
 			@LIBMATH@
 
 testFloatPow_SOURCES = testPow.h testFloatPow.c
@@ -291,9 +292,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/pow/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/pow/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/pow/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/pow/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/round/Makefile.am b/src/c/elementaryFunctions/round/Makefile.am
index bc217804..12ee342a 100644
--- a/src/c/elementaryFunctions/round/Makefile.am
+++ b/src/c/elementaryFunctions/round/Makefile.am
@@ -12,8 +12,8 @@
 
 
 
-libRound_la_CFLAGS =	-I $(top_builddir)/type \
-				-I $(top_builddir)/elementaryFunctions/includes
+libRound_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 
@@ -36,16 +36,16 @@ SRC	=	srounds.c \
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-				-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-check_LDADD	=	$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/round/libRound.la
+check_LDADD	=	$(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/round/libRound.la
 
 check_PROGRAMS	= 	testFloatRound testDoubleRound
 
-TESTS		=		testFloatRound testDoubleRound
+TESTS		=	testFloatRound testDoubleRound
 
 #
 # -*- Round Tests -*-
diff --git a/src/c/elementaryFunctions/round/Makefile.in b/src/c/elementaryFunctions/round/Makefile.in
index 4f7b8b09..63e3b5c6 100644
--- a/src/c/elementaryFunctions/round/Makefile.in
+++ b/src/c/elementaryFunctions/round/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatRound$(EXEEXT) testDoubleRound$(EXEEXT)
 TESTS = testFloatRound$(EXEEXT) testDoubleRound$(EXEEXT)
-subdir = elementaryFunctions/round
+subdir = src/c/elementaryFunctions/round
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -213,8 +213,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libRound_la_CFLAGS = -I $(top_builddir)/type \
-				-I $(top_builddir)/elementaryFunctions/includes
+libRound_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libRound.la
@@ -233,12 +233,12 @@ SRC = srounds.c \
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-				-I $(top_builddir)/type
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/elementaryFunctions/round/libRound.la
+check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \
+			$(top_builddir)/src/c/type/libFloatComplex.la \
+			$(top_builddir)/src/c/elementaryFunctions/round/libRound.la
 
 
 #
@@ -263,9 +263,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/round/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/round/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/round/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/round/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/sin/Makefile.am b/src/c/elementaryFunctions/sin/Makefile.am
index 967c7c23..4f58c56e 100644
--- a/src/c/elementaryFunctions/sin/Makefile.am
+++ b/src/c/elementaryFunctions/sin/Makefile.am
@@ -34,22 +34,22 @@ HEAD	=	../includes/sin.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-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/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-			$(top_builddir)/elementaryFunctions/exp/libExp.la \
-			$(top_builddir)/elementaryFunctions/cosh/libCosh.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 \
+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/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp/libExp.la \
+			$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.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 \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatSin testDoubleSin
diff --git a/src/c/elementaryFunctions/sin/Makefile.in b/src/c/elementaryFunctions/sin/Makefile.in
index 0a0bb7d0..ab9679d8 100644
--- a/src/c/elementaryFunctions/sin/Makefile.in
+++ b/src/c/elementaryFunctions/sin/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatSin$(EXEEXT) testDoubleSin$(EXEEXT)
 TESTS = testFloatSin$(EXEEXT) testDoubleSin$(EXEEXT)
-subdir = elementaryFunctions/sin
+subdir = src/c/elementaryFunctions/sin
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -64,19 +64,19 @@ libSin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_testDoubleSin_OBJECTS = testDoubleSin-testDoubleSin.$(OBJEXT)
 testDoubleSin_OBJECTS = $(am_testDoubleSin_OBJECTS)
-am__DEPENDENCIES_1 = $(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/sin/libSin.la \
-	$(top_builddir)/elementaryFunctions/cos/libCos.la \
-	$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-	$(top_builddir)/elementaryFunctions/exp/libExp.la \
-	$(top_builddir)/elementaryFunctions/cosh/libCosh.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
+am__DEPENDENCIES_1 = $(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/sin/libSin.la \
+	$(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \
+	$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+	$(top_builddir)/src/c/elementaryFunctions/exp/libExp.la \
+	$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.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
 testDoubleSin_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleSin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleSin_CFLAGS) \
@@ -244,22 +244,22 @@ HEAD = ../includes/sin.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/sinh/libSinh.la \
-			$(top_builddir)/elementaryFunctions/exp/libExp.la \
-			$(top_builddir)/elementaryFunctions/cosh/libCosh.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 \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp/libExp.la \
+			$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.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 \
 			@LIBMATH@
 
 
@@ -285,9 +285,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/sin/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/sin/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/sin/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/sin/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/sinh/Makefile.am b/src/c/elementaryFunctions/sinh/Makefile.am
index 8dc5e785..edcba921 100644
--- a/src/c/elementaryFunctions/sinh/Makefile.am
+++ b/src/c/elementaryFunctions/sinh/Makefile.am
@@ -11,7 +11,7 @@
 ##
 
 libSinh_la_CFLAGS =	-I ../../type \
-		-I ../includes
+			-I ../includes
 
 instdir = $(top_builddir)/lib
 
@@ -34,22 +34,22 @@ HEAD	=	../includes/sinh.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-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/sinh/libSinh.la \
-			$(top_builddir)/elementaryFunctions/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-			$(top_builddir)/elementaryFunctions/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/exp/libExp.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 \
+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/sinh/libSinh.la \
+			$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+			$(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp/libExp.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 \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatSinh testDoubleSinh
diff --git a/src/c/elementaryFunctions/sinh/Makefile.in b/src/c/elementaryFunctions/sinh/Makefile.in
index cd44a00f..11254d02 100644
--- a/src/c/elementaryFunctions/sinh/Makefile.in
+++ b/src/c/elementaryFunctions/sinh/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatSinh$(EXEEXT) testDoubleSinh$(EXEEXT)
 TESTS = testFloatSinh$(EXEEXT) testDoubleSinh$(EXEEXT)
-subdir = elementaryFunctions/sinh
+subdir = src/c/elementaryFunctions/sinh
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -64,19 +64,19 @@ libSinh_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_testDoubleSinh_OBJECTS = testDoubleSinh-testDoubleSinh.$(OBJEXT)
 testDoubleSinh_OBJECTS = $(am_testDoubleSinh_OBJECTS)
-am__DEPENDENCIES_1 = $(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/sinh/libSinh.la \
-	$(top_builddir)/elementaryFunctions/sin/libSin.la \
-	$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-	$(top_builddir)/elementaryFunctions/cos/libCos.la \
-	$(top_builddir)/elementaryFunctions/exp/libExp.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
+am__DEPENDENCIES_1 = $(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/sinh/libSinh.la \
+	$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+	$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+	$(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \
+	$(top_builddir)/src/c/elementaryFunctions/exp/libExp.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
 testDoubleSinh_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleSinh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleSinh_CFLAGS) \
@@ -225,7 +225,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libSinh_la_CFLAGS = -I ../../type \
-		-I ../includes
+			-I ../includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libSinh.la
@@ -244,22 +244,22 @@ HEAD = ../includes/sinh.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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/sinh/libSinh.la \
-			$(top_builddir)/elementaryFunctions/sin/libSin.la \
-			$(top_builddir)/elementaryFunctions/cosh/libCosh.la \
-			$(top_builddir)/elementaryFunctions/cos/libCos.la \
-			$(top_builddir)/elementaryFunctions/exp/libExp.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 \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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/sinh/libSinh.la \
+			$(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \
+			$(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \
+			$(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \
+			$(top_builddir)/src/c/elementaryFunctions/exp/libExp.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 \
 			@LIBMATH@
 
 
@@ -285,9 +285,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/sinh/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/sinh/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/sinh/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/sinh/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/sqrt/Makefile.am b/src/c/elementaryFunctions/sqrt/Makefile.am
index 978c84e0..6cde141a 100644
--- a/src/c/elementaryFunctions/sqrt/Makefile.am
+++ b/src/c/elementaryFunctions/sqrt/Makefile.am
@@ -10,10 +10,10 @@
 ##
 ##
 
-libSqrt_la_CFLAGS =	-I  $(top_builddir)/type \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/operations/includes
+libSqrt_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/operations/includes
 
 instdir = $(top_builddir)/lib
 
@@ -36,17 +36,17 @@ HEAD	=	../includes/sqrt.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-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 \
+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 \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatSqrt testDoubleSqrt
@@ -57,9 +57,9 @@ TESTS		=	testFloatSqrt testDoubleSqrt
 # -*- Square Root Tests -*-
 #
 testFloatSqrt_SOURCES = 	testSqrt.h testFloatSqrt.c
-testFloatSqrt_CFLAGS	=	$(check_INCLUDES)
-testFloatSqrt_LDADD	=	$(check_LDADD)
+testFloatSqrt_CFLAGS =		$(check_INCLUDES)
+testFloatSqrt_LDADD =		$(check_LDADD)
 
 testDoubleSqrt_SOURCES = 	testSqrt.h testDoubleSqrt.c
-testDoubleSqrt_CFLAGS	=	$(check_INCLUDES)
-testDoubleSqrt_LDADD	=	$(check_LDADD)
+testDoubleSqrt_CFLAGS =		$(check_INCLUDES)
+testDoubleSqrt_LDADD =		$(check_LDADD)
diff --git a/src/c/elementaryFunctions/sqrt/Makefile.in b/src/c/elementaryFunctions/sqrt/Makefile.in
index 4257e345..e603d8f7 100644
--- a/src/c/elementaryFunctions/sqrt/Makefile.in
+++ b/src/c/elementaryFunctions/sqrt/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatSqrt$(EXEEXT) testDoubleSqrt$(EXEEXT)
 TESTS = testFloatSqrt$(EXEEXT) testDoubleSqrt$(EXEEXT)
-subdir = elementaryFunctions/sqrt
+subdir = src/c/elementaryFunctions/sqrt
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -64,14 +64,14 @@ libSqrt_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_testDoubleSqrt_OBJECTS = testDoubleSqrt-testDoubleSqrt.$(OBJEXT)
 testDoubleSqrt_OBJECTS = $(am_testDoubleSqrt_OBJECTS)
-am__DEPENDENCIES_1 = $(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
+am__DEPENDENCIES_1 = $(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
 testDoubleSqrt_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleSqrt_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleSqrt_CFLAGS) \
@@ -219,10 +219,10 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libSqrt_la_CFLAGS = -I  $(top_builddir)/type \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes \
-			-I $(top_builddir)/operations/includes
+libSqrt_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes \
+			-I $(top_builddir)/src/c/operations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libSqrt.la
@@ -241,17 +241,17 @@ HEAD = ../includes/sqrt.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-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 \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+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 \
 			@LIBMATH@
 
 
@@ -277,9 +277,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/sqrt/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/sqrt/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/sqrt/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/sqrt/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/tan/Makefile.am b/src/c/elementaryFunctions/tan/Makefile.am
index 19489e83..71fc0112 100644
--- a/src/c/elementaryFunctions/tan/Makefile.am
+++ b/src/c/elementaryFunctions/tan/Makefile.am
@@ -10,9 +10,9 @@
 ##
 ##
 
-libTan_la_CFLAGS =	-I $(top_builddir)/type \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes
+libTan_la_CFLAGS =	-I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 
@@ -35,26 +35,26 @@ HEAD	=	../includes/tan.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-check_LDADD	=	$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/elementaryFunctions/tan/libTan.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)/elementaryFunctions/exp/libExp.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/pythag/libPythag.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_LDADD	=	$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(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/tan/libTan.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/elementaryFunctions/exp/libExp.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/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatTan testDoubleTan
diff --git a/src/c/elementaryFunctions/tan/Makefile.in b/src/c/elementaryFunctions/tan/Makefile.in
index 8e83730a..dd4e58ff 100644
--- a/src/c/elementaryFunctions/tan/Makefile.in
+++ b/src/c/elementaryFunctions/tan/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatTan$(EXEEXT) testDoubleTan$(EXEEXT)
 TESTS = testFloatTan$(EXEEXT) testDoubleTan$(EXEEXT)
-subdir = elementaryFunctions/tan
+subdir = src/c/elementaryFunctions/tan
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -64,23 +64,24 @@ libTan_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_testDoubleTan_OBJECTS = testDoubleTan-testDoubleTan.$(OBJEXT)
 testDoubleTan_OBJECTS = $(am_testDoubleTan_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/lib/lapack/libscilapack.la \
-	$(top_builddir)/type/libDoubleComplex.la \
-	$(top_builddir)/type/libFloatComplex.la \
-	$(top_builddir)/operations/addition/libAddition.la \
-	$(top_builddir)/elementaryFunctions/tan/libTan.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)/elementaryFunctions/exp/libExp.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/pythag/libPythag.la \
-	$(top_builddir)/operations/multiplication/libMultiplication.la
+am__DEPENDENCIES_1 =  \
+	$(top_builddir)/src/fortran/lapack/libscilapack.la \
+	$(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/tan/libTan.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/elementaryFunctions/exp/libExp.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/pythag/libPythag.la \
+	$(top_builddir)/src/c/operations/multiplication/libMultiplication.la
 testDoubleTan_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleTan_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleTan_CFLAGS) \
@@ -228,9 +229,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-libTan_la_CFLAGS = -I $(top_builddir)/type \
-			-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/auxiliaryFunctions/includes
+libTan_la_CFLAGS = -I $(top_builddir)/src/c/type \
+			-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/auxiliaryFunctions/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libTan.la
@@ -249,26 +250,26 @@ HEAD = ../includes/tan.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-check_LDADD = $(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/elementaryFunctions/tan/libTan.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)/elementaryFunctions/exp/libExp.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/pythag/libPythag.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+check_LDADD = $(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(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/tan/libTan.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/elementaryFunctions/exp/libExp.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/pythag/libPythag.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			@LIBMATH@
 
 
@@ -294,9 +295,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/tan/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/tan/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/tan/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/tan/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/c/elementaryFunctions/tanh/Makefile.am b/src/c/elementaryFunctions/tanh/Makefile.am
index 2fa67250..714eec18 100644
--- a/src/c/elementaryFunctions/tanh/Makefile.am
+++ b/src/c/elementaryFunctions/tanh/Makefile.am
@@ -34,27 +34,27 @@ HEAD	=	../includes/tanh.h
 # Checking Part
 ####
 
-check_INCLUDES	=	-I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
+check_INCLUDES	=	-I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
 
-check_LDADD	=	$(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/elementaryFunctions/tan/libTan.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)/elementaryFunctions/exp/libExp.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/pythag/libPythag.la \
-			$(top_builddir)/elementaryFunctions/tanh/libTanh.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_LDADD	=	$(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(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/tan/libTan.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/elementaryFunctions/exp/libExp.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/pythag/libPythag.la \
+			$(top_builddir)/src/c/elementaryFunctions/tanh/libTanh.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			@LIBMATH@
 
 check_PROGRAMS	= 	testFloatTanh testDoubleTanh
@@ -65,9 +65,9 @@ TESTS		=	testFloatTanh testDoubleTanh
 # -*- Hyperbolic Tangeant Tests -*-
 #
 testFloatTanh_SOURCES = 	testTanh.h testFloatTanh.c
-testFloatTanh_CFLAGS	=	$(check_INCLUDES)
-testFloatTanh_LDADD	=	$(check_LDADD)
+testFloatTanh_CFLAGS =		$(check_INCLUDES)
+testFloatTanh_LDADD =		$(check_LDADD)
 
 testDoubleTanh_SOURCES = 	testTanh.h testDoubleTanh.c
-testDoubleTanh_CFLAGS	=	$(check_INCLUDES)
-testDoubleTanh_LDADD	=	$(check_LDADD)
+testDoubleTanh_CFLAGS =		$(check_INCLUDES)
+testDoubleTanh_LDADD =		$(check_LDADD)
diff --git a/src/c/elementaryFunctions/tanh/Makefile.in b/src/c/elementaryFunctions/tanh/Makefile.in
index 0ccaa944..782e4485 100644
--- a/src/c/elementaryFunctions/tanh/Makefile.in
+++ b/src/c/elementaryFunctions/tanh/Makefile.in
@@ -34,7 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = testFloatTanh$(EXEEXT) testDoubleTanh$(EXEEXT)
 TESTS = testFloatTanh$(EXEEXT) testDoubleTanh$(EXEEXT)
-subdir = elementaryFunctions/tanh
+subdir = src/c/elementaryFunctions/tanh
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -64,24 +64,25 @@ libTanh_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_testDoubleTanh_OBJECTS = testDoubleTanh-testDoubleTanh.$(OBJEXT)
 testDoubleTanh_OBJECTS = $(am_testDoubleTanh_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/lib/lapack/libscilapack.la \
-	$(top_builddir)/type/libDoubleComplex.la \
-	$(top_builddir)/type/libFloatComplex.la \
-	$(top_builddir)/operations/addition/libAddition.la \
-	$(top_builddir)/elementaryFunctions/tan/libTan.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)/elementaryFunctions/exp/libExp.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/pythag/libPythag.la \
-	$(top_builddir)/elementaryFunctions/tanh/libTanh.la \
-	$(top_builddir)/operations/multiplication/libMultiplication.la
+am__DEPENDENCIES_1 =  \
+	$(top_builddir)/src/fortran/lapack/libscilapack.la \
+	$(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/tan/libTan.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/elementaryFunctions/exp/libExp.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/pythag/libPythag.la \
+	$(top_builddir)/src/c/elementaryFunctions/tanh/libTanh.la \
+	$(top_builddir)/src/c/operations/multiplication/libMultiplication.la
 testDoubleTanh_DEPENDENCIES = $(am__DEPENDENCIES_1)
 testDoubleTanh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleTanh_CFLAGS) \
@@ -249,27 +250,27 @@ HEAD = ../includes/tanh.h
 ####
 # Checking Part
 ####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
-			-I $(top_builddir)/type
-
-check_LDADD = $(top_builddir)/lib/lapack/libscilapack.la \
-			$(top_builddir)/type/libDoubleComplex.la \
-			$(top_builddir)/type/libFloatComplex.la \
-			$(top_builddir)/operations/addition/libAddition.la \
-			$(top_builddir)/elementaryFunctions/tan/libTan.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)/elementaryFunctions/exp/libExp.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/pythag/libPythag.la \
-			$(top_builddir)/elementaryFunctions/tanh/libTanh.la \
-			$(top_builddir)/operations/multiplication/libMultiplication.la \
+check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \
+			-I $(top_builddir)/src/c/type
+
+check_LDADD = $(top_builddir)/src/fortran/lapack/libscilapack.la \
+			$(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/tan/libTan.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/elementaryFunctions/exp/libExp.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/pythag/libPythag.la \
+			$(top_builddir)/src/c/elementaryFunctions/tanh/libTanh.la \
+			$(top_builddir)/src/c/operations/multiplication/libMultiplication.la \
 			@LIBMATH@
 
 
@@ -295,9 +296,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  elementaryFunctions/tanh/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/c/elementaryFunctions/tanh/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  elementaryFunctions/tanh/Makefile
+	  $(AUTOMAKE) --foreign  src/c/elementaryFunctions/tanh/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \