diff --git a/.gitignore b/.gitignore
index 14e12bf..ffa8a5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,10 +19,10 @@ configure
 aclocal.m4
 
 # bison/flex generated sources
-latan/*Lexer.cpp
-latan/*Parser.cpp
-latan/*Parser.hpp
+lib/*Lexer.cpp
+lib/*Parser.cpp
+lib/*Parser.hpp
 
 # Eigen headers
-latan/Eigen/*
-latan/eigen_files.mk
+lib/Eigen/*
+lib/eigen_files.mk
diff --git a/Makefile.am b/Makefile.am
index 617ac3c..c531723 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = latan utils examples
+SUBDIRS = lib utils examples
 
 ACLOCAL_AMFLAGS = -I .buildutils/m4
diff --git a/configure.ac b/configure.ac
index 0d14c41..97f3bd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,9 @@
 
 # Initialization
 AC_PREREQ([2.64])
-AC_INIT([LatAnalyze],[3.0alpha1],[antonin.portelli@me.com],[latan])
+AC_INIT([LatAnalyze],[3.0alpha1],[antonin.portelli@me.com],[LatAnalyze])
 AC_CONFIG_AUX_DIR([.buildutils])
-AC_CONFIG_SRCDIR([latan/Global.cpp])
+AC_CONFIG_SRCDIR([lib/Global.cpp])
 AC_CONFIG_SRCDIR([utils/sample_read.cpp])
 AC_CONFIG_SRCDIR([examples/exMathInterpreter.cpp])
 AC_CONFIG_MACRO_DIR([.buildutils/m4])
@@ -94,5 +94,5 @@ AC_SUBST([LIBS])
 AC_SUBST([AM_CFLAGS])
 AC_SUBST([AM_LDFLAGS])
 
-AC_CONFIG_FILES([Makefile latan/Makefile utils/Makefile examples/Makefile])
+AC_CONFIG_FILES([Makefile lib/Makefile utils/Makefile examples/Makefile])
 AC_OUTPUT
diff --git a/examples/LatAnalyze b/examples/LatAnalyze
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/examples/LatAnalyze
@@ -0,0 +1 @@
+../lib
\ No newline at end of file
diff --git a/examples/exCompiledDoubleFunction.cpp b/examples/exCompiledDoubleFunction.cpp
index 300095e..096c145 100644
--- a/examples/exCompiledDoubleFunction.cpp
+++ b/examples/exCompiledDoubleFunction.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <iomanip>
-#include <latan/CompiledFunction.hpp>
+#include <LatAnalyze/CompiledFunction.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/examples/exFit.cpp b/examples/exFit.cpp
index 7c474c8..c045ef9 100644
--- a/examples/exFit.cpp
+++ b/examples/exFit.cpp
@@ -1,10 +1,10 @@
 #include <iostream>
 #include <cmath>
-#include <latan/CompiledModel.hpp>
-#include <latan/MinuitMinimizer.hpp>
-#include <latan/Plot.hpp>
-#include <latan/RandGen.hpp>
-#include <latan/XYStatData.hpp>
+#include <LatAnalyze/CompiledModel.hpp>
+#include <LatAnalyze/MinuitMinimizer.hpp>
+#include <LatAnalyze/Plot.hpp>
+#include <LatAnalyze/RandGen.hpp>
+#include <LatAnalyze/XYStatData.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/examples/exMat.cpp b/examples/exMat.cpp
index c64cbbd..d396cb0 100644
--- a/examples/exMat.cpp
+++ b/examples/exMat.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
-#include <latan/AsciiFile.hpp>
-#include <latan/Mat.hpp>
-#include <latan/Math.hpp>
+#include <LatAnalyze/AsciiFile.hpp>
+#include <LatAnalyze/Mat.hpp>
+#include <LatAnalyze/Math.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/examples/exMathInterpreter.cpp b/examples/exMathInterpreter.cpp
index aaf5417..0374c1d 100644
--- a/examples/exMathInterpreter.cpp
+++ b/examples/exMathInterpreter.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
-#include <latan/Math.hpp>
-#include <latan/MathInterpreter.hpp>
+#include <LatAnalyze/Math.hpp>
+#include <LatAnalyze/MathInterpreter.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/examples/exMin.cpp b/examples/exMin.cpp
index ae5bffc..c1fcffc 100644
--- a/examples/exMin.cpp
+++ b/examples/exMin.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
-#include <latan/CompiledFunction.hpp>
-#include <latan/MinuitMinimizer.hpp>
+#include <LatAnalyze/CompiledFunction.hpp>
+#include <LatAnalyze/MinuitMinimizer.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/examples/exPlot.cpp b/examples/exPlot.cpp
index 1134e8d..63ce19a 100644
--- a/examples/exPlot.cpp
+++ b/examples/exPlot.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
-#include <latan/CompiledFunction.hpp>
-#include <latan/Math.hpp>
-#include <latan/Plot.hpp>
+#include <LatAnalyze/CompiledFunction.hpp>
+#include <LatAnalyze/Math.hpp>
+#include <LatAnalyze/Plot.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/examples/exRand.cpp b/examples/exRand.cpp
index c50bfec..974f44d 100644
--- a/examples/exRand.cpp
+++ b/examples/exRand.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
-#include <latan/AsciiFile.hpp>
-#include <latan/RandGen.hpp>
+#include <LatAnalyze/AsciiFile.hpp>
+#include <LatAnalyze/RandGen.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/examples/latan b/examples/latan
deleted file mode 120000
index 03578ae..0000000
--- a/examples/latan
+++ /dev/null
@@ -1 +0,0 @@
-../latan
\ No newline at end of file
diff --git a/latan/Makefile.am b/latan/Makefile.am
deleted file mode 100644
index c6297ba..0000000
--- a/latan/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-if CC_GNU
-    COM_CFLAGS = -Wall -W -pedantic
-else
-if CC_INTEL
-    COM_CFLAGS = -Wall
-endif
-endif
-
-if CXX_GNU
-    COM_CXXFLAGS = -Wall -W -pedantic
-else
-if CXX_INTEL
-    COM_CXXFLAGS = -Wall
-endif
-endif
-
-AM_LFLAGS = -olex.yy.c
-AM_YFLAGS = -d
-
-include eigen_files.mk
-nobase_dist_pkginclude_HEADERS = $(eigen_files)
-
-BUILT_SOURCES = AsciiParser.hpp MathParser.hpp
-
-lib_LTLIBRARIES = liblatan.la
-	
-liblatan_la_SOURCES =   \
-    AsciiFile.cpp       \
-    AsciiParser.ypp     \
-    AsciiLexer.lpp      \
-    Chi2Function.cpp    \
-    CompiledFunction.cpp\
-    CompiledModel.cpp   \
-    Exceptions.cpp      \
-    Function.cpp        \
-    Global.cpp          \
-    includes.hpp        \
-    File.cpp            \
-    FitInterface.cpp    \
-    Mat.cpp             \
-    Math.cpp            \
-    MathInterpreter.cpp \
-    MathParser.ypp      \
-    MathLexer.lpp       \
-    MatSample.cpp       \
-    Minimizer.cpp       \
-    Model.cpp           \
-    Plot.cpp            \
-    RandGen.cpp         \
-    XYSampleData.cpp    \
-    XYStatData.cpp      \
-	../config.h
-liblatan_ladir = $(pkgincludedir)
-liblatan_la_HEADERS =   \
-    AsciiFile.hpp       \
-    Chi2Function.hpp    \
-    CompiledFunction.hpp\
-    CompiledModel.hpp   \
-    Dataset.hpp         \
-    FitInterface.hpp    \
-    Function.hpp        \
-    Global.hpp          \
-    File.hpp            \
-    IoObject.hpp        \
-    Mat.hpp             \
-    Math.hpp            \
-    MathInterpreter.hpp \
-    MatSample.hpp       \
-    Minimizer.hpp       \
-    Model.hpp           \
-    ParserState.hpp     \
-    Plot.hpp            \
-    RandGen.hpp         \
-    StatArray.hpp       \
-    XYSampleData.hpp    \
-    XYStatData.hpp
-if HAVE_MINUIT
-liblatan_la_SOURCES += MinuitMinimizer.cpp
-liblatan_la_HEADERS += MinuitMinimizer.hpp
-endif
-
-liblatan_la_CFLAGS = $(COM_CFLAGS)
-liblatan_la_CXXFLAGS = $(COM_CXXFLAGS)
-
-ACLOCAL_AMFLAGS = -I .buildutils/m4
diff --git a/latan/AsciiFile.cpp b/lib/AsciiFile.cpp
similarity index 98%
rename from latan/AsciiFile.cpp
rename to lib/AsciiFile.cpp
index c56119e..c4364f4 100644
--- a/latan/AsciiFile.cpp
+++ b/lib/AsciiFile.cpp
@@ -17,8 +17,8 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/AsciiFile.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/AsciiFile.hpp>
+#include <LatAnalyze/includes.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/latan/AsciiFile.hpp b/lib/AsciiFile.hpp
similarity index 94%
rename from latan/AsciiFile.hpp
rename to lib/AsciiFile.hpp
index 5085a27..d9a35a0 100644
--- a/latan/AsciiFile.hpp
+++ b/lib/AsciiFile.hpp
@@ -20,11 +20,11 @@
 #ifndef Latan_AsciiFile_hpp_
 #define Latan_AsciiFile_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/File.hpp>
-#include <latan/Mat.hpp>
-#include <latan/MatSample.hpp>
-#include <latan/RandGen.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/File.hpp>
+#include <LatAnalyze/Mat.hpp>
+#include <LatAnalyze/MatSample.hpp>
+#include <LatAnalyze/RandGen.hpp>
 #include <fstream>
 
 BEGIN_NAMESPACE
diff --git a/latan/AsciiLexer.lpp b/lib/AsciiLexer.lpp
similarity index 97%
rename from latan/AsciiLexer.lpp
rename to lib/AsciiLexer.lpp
index 810d026..904e96b 100644
--- a/latan/AsciiLexer.lpp
+++ b/lib/AsciiLexer.lpp
@@ -26,8 +26,8 @@
 
 %{
     #include <iostream>
-	#include <latan/AsciiFile.hpp>
-	#include <latan/AsciiParser.hpp>
+	#include <LatAnalyze/AsciiFile.hpp>
+	#include <LatAnalyze/AsciiParser.hpp>
     #pragma GCC diagnostic ignored "-Wsign-compare"
     #pragma GCC diagnostic ignored "-Wunused-function"
     #pragma GCC diagnostic ignored "-Wunused-parameter"
diff --git a/latan/AsciiParser.ypp b/lib/AsciiParser.ypp
similarity index 96%
rename from latan/AsciiParser.ypp
rename to lib/AsciiParser.ypp
index f4389fb..77f1013 100644
--- a/latan/AsciiParser.ypp
+++ b/lib/AsciiParser.ypp
@@ -18,11 +18,11 @@
  */
 
 %{
-    #include <latan/Global.hpp>
-	#include <latan/AsciiFile.hpp>
-    #include <latan/Mat.hpp>
-    #include <latan/MatSample.hpp>
-    #include <latan/RandGen.hpp>
+    #include <LatAnalyze/Global.hpp>
+	#include <LatAnalyze/AsciiFile.hpp>
+    #include <LatAnalyze/Mat.hpp>
+    #include <LatAnalyze/MatSample.hpp>
+    #include <LatAnalyze/RandGen.hpp>
     #include <iostream>
     #include <sstream>
     #include <utility>
diff --git a/latan/Chi2Function.cpp b/lib/Chi2Function.cpp
similarity index 98%
rename from latan/Chi2Function.cpp
rename to lib/Chi2Function.cpp
index 3e8bf7b..bf31f7f 100644
--- a/latan/Chi2Function.cpp
+++ b/lib/Chi2Function.cpp
@@ -17,9 +17,9 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/Chi2Function.hpp>
-#include <latan/includes.hpp>
-#include <latan/XYStatData.hpp>
+#include <LatAnalyze/Chi2Function.hpp>
+#include <LatAnalyze/includes.hpp>
+#include <LatAnalyze/XYStatData.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/latan/Chi2Function.hpp b/lib/Chi2Function.hpp
similarity index 96%
rename from latan/Chi2Function.hpp
rename to lib/Chi2Function.hpp
index ceb03e7..efb4886 100644
--- a/latan/Chi2Function.hpp
+++ b/lib/Chi2Function.hpp
@@ -20,9 +20,9 @@
 #ifndef Latan_Chi2Function_hpp_
 #define Latan_Chi2Function_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/Function.hpp>
-#include <latan/Model.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/Function.hpp>
+#include <LatAnalyze/Model.hpp>
 
 BEGIN_NAMESPACE
 
diff --git a/latan/CompiledFunction.cpp b/lib/CompiledFunction.cpp
similarity index 95%
rename from latan/CompiledFunction.cpp
rename to lib/CompiledFunction.cpp
index 0658be6..bdf3776 100644
--- a/latan/CompiledFunction.cpp
+++ b/lib/CompiledFunction.cpp
@@ -17,9 +17,9 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/CompiledFunction.hpp>
-#include <latan/Math.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/CompiledFunction.hpp>
+#include <LatAnalyze/Math.hpp>
+#include <LatAnalyze/includes.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/latan/CompiledFunction.hpp b/lib/CompiledFunction.hpp
similarity index 94%
rename from latan/CompiledFunction.hpp
rename to lib/CompiledFunction.hpp
index 39eedf9..9a1b532 100644
--- a/latan/CompiledFunction.hpp
+++ b/lib/CompiledFunction.hpp
@@ -20,9 +20,9 @@
 #ifndef Latan_CompiledFunction_hpp_
 #define	Latan_CompiledFunction_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/Function.hpp>
-#include <latan/MathInterpreter.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/Function.hpp>
+#include <LatAnalyze/MathInterpreter.hpp>
 
 BEGIN_NAMESPACE
 
diff --git a/latan/CompiledModel.cpp b/lib/CompiledModel.cpp
similarity index 96%
rename from latan/CompiledModel.cpp
rename to lib/CompiledModel.cpp
index bfc1b1c..d3e104a 100644
--- a/latan/CompiledModel.cpp
+++ b/lib/CompiledModel.cpp
@@ -17,9 +17,9 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/CompiledModel.hpp>
-#include <latan/Math.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/CompiledModel.hpp>
+#include <LatAnalyze/Math.hpp>
+#include <LatAnalyze/includes.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/latan/CompiledModel.hpp b/lib/CompiledModel.hpp
similarity index 94%
rename from latan/CompiledModel.hpp
rename to lib/CompiledModel.hpp
index c2c0645..420ba6d 100644
--- a/latan/CompiledModel.hpp
+++ b/lib/CompiledModel.hpp
@@ -20,9 +20,9 @@
 #ifndef Latan_CompiledModel_hpp_
 #define Latan_CompiledModel_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/Model.hpp>
-#include <latan/MathInterpreter.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/Model.hpp>
+#include <LatAnalyze/MathInterpreter.hpp>
 
 BEGIN_NAMESPACE
 
diff --git a/latan/Dataset.hpp b/lib/Dataset.hpp
similarity index 96%
rename from latan/Dataset.hpp
rename to lib/Dataset.hpp
index 0ae980b..abc083e 100644
--- a/latan/Dataset.hpp
+++ b/lib/Dataset.hpp
@@ -20,10 +20,10 @@
 #ifndef Latan_Dataset_hpp_
 #define Latan_Dataset_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/File.hpp>
-#include <latan/StatArray.hpp>
-#include <latan/RandGen.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/File.hpp>
+#include <LatAnalyze/StatArray.hpp>
+#include <LatAnalyze/RandGen.hpp>
 #include <fstream>
 #include <vector>
 
diff --git a/latan/Exceptions.cpp b/lib/Exceptions.cpp
similarity index 92%
rename from latan/Exceptions.cpp
rename to lib/Exceptions.cpp
index 6377e4e..9e46582 100644
--- a/latan/Exceptions.cpp
+++ b/lib/Exceptions.cpp
@@ -17,8 +17,8 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/Exceptions.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/Exceptions.hpp>
+#include <LatAnalyze/includes.hpp>
 
 #ifndef ERR_SUFF
 #define ERR_SUFF " (" + loc + ")"
@@ -43,7 +43,7 @@ CONST_EXC(Size, Logic("size error: " + msg, loc))
 CONST_EXC(Runtime, runtime_error(Env::msgPrefix + msg + ERR_SUFF))
 CONST_EXC(Compilation, Runtime("compilation error: " + msg, loc))
 CONST_EXC(Io, Runtime("IO error: " + msg, loc))
-CONST_EXC(Memory , Runtime("memory error: " + msg, loc))
+CONST_EXC(Memory, Runtime("memory error: " + msg, loc))
 CONST_EXC(Parsing, Runtime(msg, loc))
 CONST_EXC(Program, Runtime(msg, loc))
 CONST_EXC(Syntax, Runtime("syntax error: " + msg, loc))
diff --git a/latan/Exceptions.hpp b/lib/Exceptions.hpp
similarity index 98%
rename from latan/Exceptions.hpp
rename to lib/Exceptions.hpp
index b1b3e57..cb61cf7 100644
--- a/latan/Exceptions.hpp
+++ b/lib/Exceptions.hpp
@@ -22,7 +22,7 @@
 
 #include <stdexcept>
 #ifndef LATAN_GLOBAL_HPP_
-#include <latan/Global.hpp>
+#include <LatAnalyze/Global.hpp>
 #endif
 
 #define SRC_LOC strFrom(__FUNCTION__) + " at " + strFrom(__FILE__) + ":"\
diff --git a/latan/File.cpp b/lib/File.cpp
similarity index 96%
rename from latan/File.cpp
rename to lib/File.cpp
index 63e7909..0e973e3 100644
--- a/latan/File.cpp
+++ b/lib/File.cpp
@@ -17,8 +17,8 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/File.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/File.hpp>
+#include <LatAnalyze/includes.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/latan/File.hpp b/lib/File.hpp
similarity index 97%
rename from latan/File.hpp
rename to lib/File.hpp
index d6210a9..de2391c 100644
--- a/latan/File.hpp
+++ b/lib/File.hpp
@@ -20,9 +20,9 @@
 #ifndef Latan_Io_hpp_
 #define	Latan_Io_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/IoObject.hpp>
-#include <latan/ParserState.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/IoObject.hpp>
+#include <LatAnalyze/ParserState.hpp>
 #include <queue>
 #include <unordered_map>
 
diff --git a/latan/FitInterface.cpp b/lib/FitInterface.cpp
similarity index 98%
rename from latan/FitInterface.cpp
rename to lib/FitInterface.cpp
index f11dec5..a12bf30 100644
--- a/latan/FitInterface.cpp
+++ b/lib/FitInterface.cpp
@@ -17,8 +17,8 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/FitInterface.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/FitInterface.hpp>
+#include <LatAnalyze/includes.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/latan/FitInterface.hpp b/lib/FitInterface.hpp
similarity index 97%
rename from latan/FitInterface.hpp
rename to lib/FitInterface.hpp
index c746c26..ff401e4 100644
--- a/latan/FitInterface.hpp
+++ b/lib/FitInterface.hpp
@@ -20,8 +20,8 @@
 #ifndef Latan_FitInterface_hpp_
 #define Latan_FitInterface_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/Minimizer.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/Minimizer.hpp>
 
 BEGIN_NAMESPACE
 
diff --git a/latan/Function.cpp b/lib/Function.cpp
similarity index 97%
rename from latan/Function.cpp
rename to lib/Function.cpp
index d990e33..b4971ba 100644
--- a/latan/Function.cpp
+++ b/lib/Function.cpp
@@ -17,8 +17,8 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/Function.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/Function.hpp>
+#include <LatAnalyze/includes.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/latan/Function.hpp b/lib/Function.hpp
similarity index 96%
rename from latan/Function.hpp
rename to lib/Function.hpp
index 7bbc51e..578865c 100644
--- a/latan/Function.hpp
+++ b/lib/Function.hpp
@@ -20,9 +20,9 @@
 #ifndef Latan_Function_hpp_
 #define	Latan_Function_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/Mat.hpp>
-#include <latan/MatSample.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/Mat.hpp>
+#include <LatAnalyze/MatSample.hpp>
 #include <functional>
 #include <stack>
 #include <vector>
diff --git a/latan/Global.cpp b/lib/Global.cpp
similarity index 93%
rename from latan/Global.cpp
rename to lib/Global.cpp
index 380ed74..e5280a7 100644
--- a/latan/Global.cpp
+++ b/lib/Global.cpp
@@ -17,8 +17,8 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/Global.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/includes.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/latan/Global.hpp b/lib/Global.hpp
similarity index 98%
rename from latan/Global.hpp
rename to lib/Global.hpp
index ee278ca..ca9f324 100644
--- a/latan/Global.hpp
+++ b/lib/Global.hpp
@@ -23,7 +23,7 @@
 // supress warning for the osbolete use of 'register' keyword in Eigen
 #pragma GCC diagnostic ignored "-Wdeprecated-register"
 
-#include <latan/Eigen/Dense>
+#include <LatAnalyze/Eigen/Dense>
 #include <memory>
 #include <string>
 #include <sstream>
@@ -184,6 +184,6 @@ inline std::string strFrom(const T x)
 
 END_NAMESPACE
 
-#include <latan/Exceptions.hpp>
+#include <LatAnalyze/Exceptions.hpp>
 
 #endif // Latan_Global_hpp_
diff --git a/latan/IoObject.hpp b/lib/IoObject.hpp
similarity index 97%
rename from latan/IoObject.hpp
rename to lib/IoObject.hpp
index 2912023..229d9b4 100644
--- a/latan/IoObject.hpp
+++ b/lib/IoObject.hpp
@@ -20,7 +20,7 @@
 #ifndef Latan_IoObject_hpp_
 #define Latan_IoObject_hpp_
 
-#include <latan/Global.hpp>
+#include <LatAnalyze/Global.hpp>
 
 BEGIN_NAMESPACE
 
diff --git a/latan/latan b/lib/LatAnalyze
similarity index 100%
rename from latan/latan
rename to lib/LatAnalyze
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 0000000..ad21139
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,85 @@
+if CC_GNU
+    COM_CFLAGS = -Wall -W -pedantic
+else
+if CC_INTEL
+    COM_CFLAGS = -Wall
+endif
+endif
+
+if CXX_GNU
+    COM_CXXFLAGS = -Wall -W -pedantic
+else
+if CXX_INTEL
+    COM_CXXFLAGS = -Wall
+endif
+endif
+
+AM_LFLAGS = -olex.yy.c
+AM_YFLAGS = -d
+
+include eigen_files.mk
+nobase_dist_pkginclude_HEADERS = $(eigen_files)
+
+BUILT_SOURCES = AsciiParser.hpp MathParser.hpp
+
+lib_LTLIBRARIES = libLatAnalyze.la
+	
+libLatAnalyze_la_SOURCES =\
+    AsciiFile.cpp         \
+    AsciiParser.ypp       \
+    AsciiLexer.lpp        \
+    Chi2Function.cpp      \
+    CompiledFunction.cpp  \
+    CompiledModel.cpp     \
+    Exceptions.cpp        \
+    Function.cpp          \
+    Global.cpp            \
+    includes.hpp          \
+    File.cpp              \
+    FitInterface.cpp      \
+    Mat.cpp               \
+    Math.cpp              \
+    MathInterpreter.cpp   \
+    MathParser.ypp        \
+    MathLexer.lpp         \
+    MatSample.cpp         \
+    Minimizer.cpp         \
+    Model.cpp             \
+    Plot.cpp              \
+    RandGen.cpp           \
+    XYSampleData.cpp      \
+    XYStatData.cpp        \
+	../config.h
+libLatAnalyze_ladir = $(pkgincludedir)
+libLatAnalyze_la_HEADERS =\
+    AsciiFile.hpp         \
+    Chi2Function.hpp      \
+    CompiledFunction.hpp  \
+    CompiledModel.hpp     \
+    Dataset.hpp           \
+    FitInterface.hpp      \
+    Function.hpp          \
+    Global.hpp            \
+    File.hpp              \
+    IoObject.hpp          \
+    Mat.hpp               \
+    Math.hpp              \
+    MathInterpreter.hpp   \
+    MatSample.hpp         \
+    Minimizer.hpp         \
+    Model.hpp             \
+    ParserState.hpp       \
+    Plot.hpp              \
+    RandGen.hpp           \
+    StatArray.hpp         \
+    XYSampleData.hpp      \
+    XYStatData.hpp
+if HAVE_MINUIT
+libLatAnalyze_la_SOURCES += MinuitMinimizer.cpp
+libLatAnalyze_la_HEADERS += MinuitMinimizer.hpp
+endif
+
+libLatAnalyze_la_CFLAGS   = $(COM_CFLAGS)
+libLatAnalyze_la_CXXFLAGS = $(COM_CXXFLAGS)
+
+ACLOCAL_AMFLAGS = -I .buildutils/m4
diff --git a/latan/Mat.cpp b/lib/Mat.cpp
similarity index 95%
rename from latan/Mat.cpp
rename to lib/Mat.cpp
index 5baf25b..cf198f6 100644
--- a/latan/Mat.cpp
+++ b/lib/Mat.cpp
@@ -17,8 +17,8 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/Mat.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/Mat.hpp>
+#include <LatAnalyze/includes.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/latan/Mat.hpp b/lib/Mat.hpp
similarity index 95%
rename from latan/Mat.hpp
rename to lib/Mat.hpp
index 608b2a8..7ee2884 100644
--- a/latan/Mat.hpp
+++ b/lib/Mat.hpp
@@ -20,8 +20,8 @@
 #ifndef Latan_Mat_hpp_
 #define Latan_Mat_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/IOObject.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/IOObject.hpp>
 
 #define FOR_MAT(mat, i, j) \
 for (Latan::Index j = 0; j < mat.cols(); ++j)\
diff --git a/latan/MatSample.cpp b/lib/MatSample.cpp
similarity index 97%
rename from latan/MatSample.cpp
rename to lib/MatSample.cpp
index 09307a1..af2b737 100644
--- a/latan/MatSample.cpp
+++ b/lib/MatSample.cpp
@@ -17,8 +17,8 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/MatSample.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/MatSample.hpp>
+#include <LatAnalyze/includes.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/latan/MatSample.hpp b/lib/MatSample.hpp
similarity index 98%
rename from latan/MatSample.hpp
rename to lib/MatSample.hpp
index f5f117c..ea15948 100644
--- a/latan/MatSample.hpp
+++ b/lib/MatSample.hpp
@@ -20,9 +20,9 @@
 #ifndef Latan_MatSample_hpp_
 #define Latan_MatSample_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/Mat.hpp>
-#include <latan/StatArray.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/Mat.hpp>
+#include <LatAnalyze/StatArray.hpp>
 
 BEGIN_NAMESPACE
 
diff --git a/latan/Math.cpp b/lib/Math.cpp
similarity index 98%
rename from latan/Math.cpp
rename to lib/Math.cpp
index fdf0333..ccaf267 100644
--- a/latan/Math.cpp
+++ b/lib/Math.cpp
@@ -17,8 +17,8 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/Math.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/Math.hpp>
+#include <LatAnalyze/includes.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/latan/Math.hpp b/lib/Math.hpp
similarity index 95%
rename from latan/Math.hpp
rename to lib/Math.hpp
index 777c8f0..7a25ac0 100644
--- a/latan/Math.hpp
+++ b/lib/Math.hpp
@@ -20,9 +20,9 @@
 #ifndef Latan_Math_hpp_
 #define	Latan_Math_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/Function.hpp>
-#include <latan/MathInterpreter.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/Function.hpp>
+#include <LatAnalyze/MathInterpreter.hpp>
 
 BEGIN_NAMESPACE
 
diff --git a/latan/MathInterpreter.cpp b/lib/MathInterpreter.cpp
similarity index 99%
rename from latan/MathInterpreter.cpp
rename to lib/MathInterpreter.cpp
index 5c8f8dd..5b4abfa 100644
--- a/latan/MathInterpreter.cpp
+++ b/lib/MathInterpreter.cpp
@@ -17,8 +17,8 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/MathInterpreter.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/MathInterpreter.hpp>
+#include <LatAnalyze/includes.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/latan/MathInterpreter.hpp b/lib/MathInterpreter.hpp
similarity index 98%
rename from latan/MathInterpreter.hpp
rename to lib/MathInterpreter.hpp
index 4e0538c..4a72397 100644
--- a/latan/MathInterpreter.hpp
+++ b/lib/MathInterpreter.hpp
@@ -25,9 +25,9 @@
 #include <queue>
 #include <string>
 #include <stack>
-#include <latan/Function.hpp>
-#include <latan/Global.hpp>
-#include <latan/ParserState.hpp>
+#include <LatAnalyze/Function.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/ParserState.hpp>
 
 #define MAXIDLENGTH 256
 
diff --git a/latan/MathLexer.lpp b/lib/MathLexer.lpp
similarity index 96%
rename from latan/MathLexer.lpp
rename to lib/MathLexer.lpp
index 90312b0..2a8a4b2 100644
--- a/latan/MathLexer.lpp
+++ b/lib/MathLexer.lpp
@@ -26,8 +26,8 @@
 
 %{
     #include <iostream>
-    #include <latan/MathInterpreter.hpp>
-    #include <latan/MathParser.hpp>
+    #include <LatAnalyze/MathInterpreter.hpp>
+    #include <LatAnalyze/MathParser.hpp>
     #pragma GCC diagnostic ignored "-Wsign-compare"
     #pragma GCC diagnostic ignored "-Wunused-function"
     #pragma GCC diagnostic ignored "-Wunused-parameter"
diff --git a/latan/MathParser.ypp b/lib/MathParser.ypp
similarity index 97%
rename from latan/MathParser.ypp
rename to lib/MathParser.ypp
index 681be81..4533d40 100644
--- a/latan/MathParser.ypp
+++ b/lib/MathParser.ypp
@@ -21,8 +21,8 @@
     #include <iostream>
     #include <sstream>
     #include <cstring>
-    #include <latan/Global.hpp>
-	#include <latan/MathInterpreter.hpp>
+    #include <LatAnalyze/Global.hpp>
+	#include <LatAnalyze/MathInterpreter.hpp>
 
     using namespace std;
     using namespace Latan;
diff --git a/latan/Minimizer.cpp b/lib/Minimizer.cpp
similarity index 95%
rename from latan/Minimizer.cpp
rename to lib/Minimizer.cpp
index 9f30941..42f0b03 100644
--- a/latan/Minimizer.cpp
+++ b/lib/Minimizer.cpp
@@ -17,8 +17,8 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/Minimizer.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/Minimizer.hpp>
+#include <LatAnalyze/includes.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/latan/Minimizer.hpp b/lib/Minimizer.hpp
similarity index 94%
rename from latan/Minimizer.hpp
rename to lib/Minimizer.hpp
index d02a30b..3e16ae8 100644
--- a/latan/Minimizer.hpp
+++ b/lib/Minimizer.hpp
@@ -20,9 +20,9 @@
 #ifndef Latan_Minimizer_hpp_
 #define Latan_Minimizer_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/Function.hpp>
-#include <latan/Mat.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/Function.hpp>
+#include <LatAnalyze/Mat.hpp>
 
 BEGIN_NAMESPACE
 
diff --git a/latan/MinuitMinimizer.cpp b/lib/MinuitMinimizer.cpp
similarity index 98%
rename from latan/MinuitMinimizer.cpp
rename to lib/MinuitMinimizer.cpp
index c901a86..d9b3bf0 100644
--- a/latan/MinuitMinimizer.cpp
+++ b/lib/MinuitMinimizer.cpp
@@ -17,8 +17,8 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/MinuitMinimizer.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/MinuitMinimizer.hpp>
+#include <LatAnalyze/includes.hpp>
 #include <Minuit2/FCNBase.h>
 #include <Minuit2/FunctionMinimum.h>
 #include <Minuit2/MnMigrad.h>
diff --git a/latan/MinuitMinimizer.hpp b/lib/MinuitMinimizer.hpp
similarity index 94%
rename from latan/MinuitMinimizer.hpp
rename to lib/MinuitMinimizer.hpp
index 18483ae..1c1701e 100644
--- a/latan/MinuitMinimizer.hpp
+++ b/lib/MinuitMinimizer.hpp
@@ -20,9 +20,9 @@
 #ifndef Latan_MinuitMinimizer_hpp_
 #define Latan_MinuitMinimizer_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/Function.hpp>
-#include <latan/Minimizer.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/Function.hpp>
+#include <LatAnalyze/Minimizer.hpp>
 #include <Minuit2/FCNBase.h>
 
 BEGIN_NAMESPACE
diff --git a/latan/Model.cpp b/lib/Model.cpp
similarity index 98%
rename from latan/Model.cpp
rename to lib/Model.cpp
index a35f354..118e124 100644
--- a/latan/Model.cpp
+++ b/lib/Model.cpp
@@ -17,8 +17,8 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/Model.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/Model.hpp>
+#include <LatAnalyze/includes.hpp>
 #include <functional>
 
 using namespace std;
diff --git a/latan/Model.hpp b/lib/Model.hpp
similarity index 95%
rename from latan/Model.hpp
rename to lib/Model.hpp
index 94f132e..637a493 100644
--- a/latan/Model.hpp
+++ b/lib/Model.hpp
@@ -20,9 +20,9 @@
 #ifndef Latan_Model_hpp_
 #define Latan_Model_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/Function.hpp>
-#include <latan/Mat.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/Function.hpp>
+#include <LatAnalyze/Mat.hpp>
 #include <vector>
 
 BEGIN_NAMESPACE
diff --git a/latan/ParserState.hpp b/lib/ParserState.hpp
similarity index 97%
rename from latan/ParserState.hpp
rename to lib/ParserState.hpp
index eaba089..651b2c8 100644
--- a/latan/ParserState.hpp
+++ b/lib/ParserState.hpp
@@ -20,7 +20,7 @@
 #ifndef Latan_ParserState_hpp_
 #define	Latan_ParserState_hpp_
 
-#include <latan/Global.hpp>
+#include <LatAnalyze/Global.hpp>
 #include <iostream>
 
 BEGIN_NAMESPACE
diff --git a/latan/Plot.cpp b/lib/Plot.cpp
similarity index 99%
rename from latan/Plot.cpp
rename to lib/Plot.cpp
index 9dd8659..7628787 100644
--- a/latan/Plot.cpp
+++ b/lib/Plot.cpp
@@ -17,9 +17,9 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/Plot.hpp>
-#include <latan/includes.hpp>
-#include <latan/Mat.hpp>
+#include <LatAnalyze/Plot.hpp>
+#include <LatAnalyze/includes.hpp>
+#include <LatAnalyze/Mat.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/latan/Plot.hpp b/lib/Plot.hpp
similarity index 98%
rename from latan/Plot.hpp
rename to lib/Plot.hpp
index d3a3371..97d3e39 100644
--- a/latan/Plot.hpp
+++ b/lib/Plot.hpp
@@ -20,9 +20,9 @@
 #ifndef Latan_Plot_hpp_
 #define Latan_Plot_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/Mat.hpp>
-#include <latan/XYStatData.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/Mat.hpp>
+#include <LatAnalyze/XYStatData.hpp>
 #include <sstream>
 #include <stack>
 #include <vector>
diff --git a/latan/RandGen.cpp b/lib/RandGen.cpp
similarity index 99%
rename from latan/RandGen.cpp
rename to lib/RandGen.cpp
index 927d31a..caff086 100644
--- a/latan/RandGen.cpp
+++ b/lib/RandGen.cpp
@@ -17,8 +17,8 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/RandGen.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/RandGen.hpp>
+#include <LatAnalyze/includes.hpp>
 
 #ifndef RLXD_LEVEL
 #define RLXD_LEVEL 1
diff --git a/latan/RandGen.hpp b/lib/RandGen.hpp
similarity index 97%
rename from latan/RandGen.hpp
rename to lib/RandGen.hpp
index 64f69e1..9a9e90c 100644
--- a/latan/RandGen.hpp
+++ b/lib/RandGen.hpp
@@ -20,8 +20,8 @@
 #ifndef Latan_RandGen_hpp_
 #define Latan_RandGen_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/IoObject.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/IoObject.hpp>
 
 #define RLXG_STATE_SIZE 105u
 
diff --git a/latan/StatArray.hpp b/lib/StatArray.hpp
similarity index 99%
rename from latan/StatArray.hpp
rename to lib/StatArray.hpp
index 70508f0..d2f9368 100644
--- a/latan/StatArray.hpp
+++ b/lib/StatArray.hpp
@@ -20,8 +20,8 @@
 #ifndef Latan_StatArray_hpp_
 #define Latan_StatArray_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/Mat.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/Mat.hpp>
 #include <iostream>
 
 #define FOR_STAT_ARRAY(ar, i) \
diff --git a/latan/XYSampleData.cpp b/lib/XYSampleData.cpp
similarity index 99%
rename from latan/XYSampleData.cpp
rename to lib/XYSampleData.cpp
index 76477a5..18e6af7 100644
--- a/latan/XYSampleData.cpp
+++ b/lib/XYSampleData.cpp
@@ -17,8 +17,8 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/XYSampleData.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/XYSampleData.hpp>
+#include <LatAnalyze/includes.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/latan/XYSampleData.hpp b/lib/XYSampleData.hpp
similarity index 95%
rename from latan/XYSampleData.hpp
rename to lib/XYSampleData.hpp
index 3bc4540..40ab38b 100644
--- a/latan/XYSampleData.hpp
+++ b/lib/XYSampleData.hpp
@@ -20,12 +20,12 @@
 #ifndef Latan_XYSampleData_hpp_
 #define Latan_XYSampleData_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/FitInterface.hpp>
-#include <latan/Function.hpp>
-#include <latan/MatSample.hpp>
-#include <latan/Minimizer.hpp>
-#include <latan/XYStatData.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/FitInterface.hpp>
+#include <LatAnalyze/Function.hpp>
+#include <LatAnalyze/MatSample.hpp>
+#include <LatAnalyze/Minimizer.hpp>
+#include <LatAnalyze/XYStatData.hpp>
 
 BEGIN_NAMESPACE
 
diff --git a/latan/XYStatData.cpp b/lib/XYStatData.cpp
similarity index 99%
rename from latan/XYStatData.cpp
rename to lib/XYStatData.cpp
index ae720ef..2ddb0c9 100644
--- a/latan/XYStatData.cpp
+++ b/lib/XYStatData.cpp
@@ -17,8 +17,8 @@
  * along with LatAnalyze 3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <latan/XYStatData.hpp>
-#include <latan/includes.hpp>
+#include <LatAnalyze/XYStatData.hpp>
+#include <LatAnalyze/includes.hpp>
 
 using namespace std;
 using namespace Latan;
diff --git a/latan/XYStatData.hpp b/lib/XYStatData.hpp
similarity index 95%
rename from latan/XYStatData.hpp
rename to lib/XYStatData.hpp
index 553b59e..75b14cc 100644
--- a/latan/XYStatData.hpp
+++ b/lib/XYStatData.hpp
@@ -20,13 +20,13 @@
 #ifndef Latan_XYData_hpp_
 #define Latan_XYData_hpp_
 
-#include <latan/Global.hpp>
-#include <latan/Chi2Function.hpp>
-#include <latan/FitInterface.hpp>
-#include <latan/Function.hpp>
-#include <latan/Mat.hpp>
-#include <latan/Minimizer.hpp>
-#include <latan/Model.hpp>
+#include <LatAnalyze/Global.hpp>
+#include <LatAnalyze/Chi2Function.hpp>
+#include <LatAnalyze/FitInterface.hpp>
+#include <LatAnalyze/Function.hpp>
+#include <LatAnalyze/Mat.hpp>
+#include <LatAnalyze/Minimizer.hpp>
+#include <LatAnalyze/Model.hpp>
 #include <vector>
 
 BEGIN_NAMESPACE
diff --git a/latan/includes.hpp b/lib/includes.hpp
similarity index 100%
rename from latan/includes.hpp
rename to lib/includes.hpp
diff --git a/utils/LatAnalyze b/utils/LatAnalyze
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/utils/LatAnalyze
@@ -0,0 +1 @@
+../lib
\ No newline at end of file
diff --git a/utils/latan b/utils/latan
deleted file mode 120000
index 03578ae..0000000
--- a/utils/latan
+++ /dev/null
@@ -1 +0,0 @@
-../latan
\ No newline at end of file
diff --git a/utils/resample.cpp b/utils/resample.cpp
index 3027581..0abc4c9 100644
--- a/utils/resample.cpp
+++ b/utils/resample.cpp
@@ -1,8 +1,8 @@
 #include <iostream>
 #include <libgen.h>
 #include <unistd.h>
-#include <latan/AsciiFile.hpp>
-#include <latan/Dataset.hpp>
+#include <LatAnalyze/AsciiFile.hpp>
+#include <LatAnalyze/Dataset.hpp>
 
 #ifndef DEF_NSAMPLE
 #define DEF_NSAMPLE 100
diff --git a/utils/sample_read.cpp b/utils/sample_read.cpp
index 13faeda..2a3ac64 100644
--- a/utils/sample_read.cpp
+++ b/utils/sample_read.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
-#include <latan/AsciiFile.hpp>
-#include <latan/Plot.hpp>
+#include <LatAnalyze/AsciiFile.hpp>
+#include <LatAnalyze/Plot.hpp>
 
 using namespace std;
 using namespace Latan;