diff --git a/qmake.build/c++/c++.pro b/qmake.build/c++/c++.pro
new file mode 100644
index 0000000..2d988ec
--- /dev/null
+++ b/qmake.build/c++/c++.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS += libstl
diff --git a/qmake.build/c++/libstl/libstl.pro b/qmake.build/c++/libstl/libstl.pro
new file mode 100644
index 0000000..eb34e44
--- /dev/null
+++ b/qmake.build/c++/libstl/libstl.pro
@@ -0,0 +1,55 @@
+isEmpty(PREFIX_DIR) {
+  PREFIX_DIR = ../../..
+}
+
+include(../../config.pri)
+
+message($$PREFIX_DIR)
+
+TEMPLATE = lib
+TARGET = fougstl-c++$$TARGET_SUFFIX
+DESTDIR = $$PREFIX_DIR/lib
+CONFIG *= dll
+
+dll {
+  DEFINES *= FOUG_STL_DLL FOUG_STL_MAKE_DLL
+}
+
+#*g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
+#*g++*:QMAKE_CXXFLAGS_RELEASE += -O3
+
+INCLUDEPATH += ../../../src
+
+HEADERS += \
+    ../../../src/c++/io_base.h \
+    ../../../src/c++/foug_global.h \
+    ../../../src/c++/abstract_task_progress.h \
+    ../../../src/c++/abstract_stream.h \
+    ../../../src/c++/streams/std_io_stream.h \
+    ../../../src/c++/streams/qt4_stream.h \
+    ../../../src/c++/libstl/abstract_geometry.h \
+    ../../../src/c++/libstl/stlb.h \
+    ../../../src/c++/libstl/stla.h \
+    ../../../src/c++/libstl/stl_global.h
+
+SOURCES += \
+    ../../../src/c++/io_base.cpp \
+    ../../../src/c++/abstract_task_progress.cpp \
+#    ../../src/streams/std_io_stream.cpp \
+    ../../../src/c++/streams/qt4_stream.cpp \
+    ../../../src/c++/libstl/stlb.cpp \
+    ../../../src/c++/libstl/stla.cpp
+
+global_inc.path  = $$PREFIX_DIR/include
+global_inc.files = ../../../src/*.h
+cpp_global_inc.path  = $$PREFIX_DIR/include/c++
+cpp_global_inc.files = ../../../src/c++/*.h
+cpp_streams_inc.path  = $$PREFIX_DIR/include/c++/streams
+cpp_streams_inc.files = ../../../src/c++/streams/*.h
+cpp_libstl_inc.path  = $$PREFIX_DIR/include/c++/libstl
+cpp_libstl_inc.files = ../../../src/c++/libstl/*.h
+INSTALLS += global_inc  cpp_global_inc  cpp_streams_inc  cpp_libstl_inc
+
+VER_MAJ = 0
+VER_MIN = 1
+VER_PAT = 0
diff --git a/qmake.build/foug_dataex.pro b/qmake.build/foug_dataex.pro
index 729669f..c9e8d93 100644
--- a/qmake.build/foug_dataex.pro
+++ b/qmake.build/foug_dataex.pro
@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
 CONFIG *= ordered
 
-SUBDIRS += libstl
+SUBDIRS += c++
diff --git a/qmake.build/libstl/libstl.pro b/qmake.build/libstl/libstl.pro
deleted file mode 100644
index 0dc8d57..0000000
--- a/qmake.build/libstl/libstl.pro
+++ /dev/null
@@ -1,39 +0,0 @@
-include(../config.pri)
-
-TEMPLATE = lib
-TARGET = fougstl$$TARGET_SUFFIX
-DESTDIR = ../../bin
-CONFIG *= dll
-
-dll {
-  DEFINES *= FOUG_STL_DLL FOUG_STL_MAKE_DLL
-}
-
-#*g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
-#*g++*:QMAKE_CXXFLAGS_RELEASE += -O3
-
-INCLUDEPATH += ../../src
-
-HEADERS += \
-    ../../src/io_base.h \
-    ../../src/foug_global.h \
-    ../../src/abstract_task_progress.h \
-    ../../src/abstract_stream.h \
-    ../../src/streams/std_io_stream.h \
-    ../../src/streams/qt4_stream.h \
-    ../../src/libstl/abstract_geometry.h \
-    ../../src/libstl/stlb.h \
-    ../../src/libstl/stla.h \
-    ../../src/libstl/stl_global.h
-
-SOURCES += \
-    ../../src/io_base.cpp \
-    ../../src/abstract_task_progress.cpp \
-#    ../../src/streams/std_io_stream.cpp \
-    ../../src/streams/qt4_stream.cpp \
-    ../../src/libstl/stlb.cpp \
-    ../../src/libstl/stla.cpp
-
-VER_MAJ = 0
-VER_MIN = 1
-VER_PAT = 0
diff --git a/src/abstract_stream.h b/src/c++/abstract_stream.h
similarity index 79%
rename from src/abstract_stream.h
rename to src/c++/abstract_stream.h
index ec69e63..168d377 100644
--- a/src/abstract_stream.h
+++ b/src/c++/abstract_stream.h
@@ -1,5 +1,5 @@
-#ifndef FOUG_ABSTRACT_STREAM_H
-#define FOUG_ABSTRACT_STREAM_H
+#ifndef FOUG_CPP_ABSTRACT_STREAM_H
+#define FOUG_CPP_ABSTRACT_STREAM_H
 
 #include "foug_global.h"
 
@@ -21,4 +21,4 @@ public:
 
 } // namespace foug
 
-#endif // FOUG_ABSTRACT_STREAM_H
+#endif // FOUG_CPP_ABSTRACT_STREAM_H
diff --git a/src/abstract_task_progress.cpp b/src/c++/abstract_task_progress.cpp
similarity index 100%
rename from src/abstract_task_progress.cpp
rename to src/c++/abstract_task_progress.cpp
diff --git a/src/abstract_task_progress.h b/src/c++/abstract_task_progress.h
similarity index 85%
rename from src/abstract_task_progress.h
rename to src/c++/abstract_task_progress.h
index b5dac1a..83e3ce8 100644
--- a/src/abstract_task_progress.h
+++ b/src/c++/abstract_task_progress.h
@@ -1,5 +1,5 @@
-#ifndef FOUG_ABSTRACT_TASK_PROGRESS_H
-#define FOUG_ABSTRACT_TASK_PROGRESS_H
+#ifndef FOUG_CPP_ABSTRACT_TASK_PROGRESS_H
+#define FOUG_CPP_ABSTRACT_TASK_PROGRESS_H
 
 namespace foug {
 
@@ -39,4 +39,4 @@ private:
 
 } // namespace foug
 
-#endif // FOUG_ABSTRACT_TASK_PROGRESS_H
+#endif // FOUG_CPP_ABSTRACT_TASK_PROGRESS_H
diff --git a/src/foug_global.h b/src/c++/foug_global.h
similarity index 90%
rename from src/foug_global.h
rename to src/c++/foug_global.h
index 9649e9b..f0091e6 100644
--- a/src/foug_global.h
+++ b/src/c++/foug_global.h
@@ -1,5 +1,5 @@
-#ifndef FOUG_GLOBAL_H
-#define FOUG_GLOBAL_H
+#ifndef FOUG_CPP_GLOBAL_H
+#define FOUG_CPP_GLOBAL_H
 
 #if defined(WIN64) || defined(_WIN64) || defined(__WIN64__)
     || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
@@ -36,4 +36,4 @@ typedef double Real64;
 
 } // namespace foug
 
-#endif // FOUG_GLOBAL_H
+#endif // FOUG_CPP_GLOBAL_H
diff --git a/src/io_base.cpp b/src/c++/io_base.cpp
similarity index 100%
rename from src/io_base.cpp
rename to src/c++/io_base.cpp
diff --git a/src/io_base.h b/src/c++/io_base.h
similarity index 87%
rename from src/io_base.h
rename to src/c++/io_base.h
index 730c7ad..6fec4a0 100644
--- a/src/io_base.h
+++ b/src/c++/io_base.h
@@ -1,5 +1,5 @@
-#ifndef FOUG_IO_BASE_H
-#define FOUG_IO_BASE_H
+#ifndef FOUG_CPP_IO_BASE_H
+#define FOUG_CPP_IO_BASE_H
 
 namespace foug {
 
@@ -32,4 +32,4 @@ private:
 
 } // namespace foug
 
-#endif // FOUG_IO_BASE_H
+#endif // FOUG_CPP_IO_BASE_H
diff --git a/src/libstl/abstract_geometry.h b/src/c++/libstl/abstract_geometry.h
similarity index 79%
rename from src/libstl/abstract_geometry.h
rename to src/c++/libstl/abstract_geometry.h
index 5698469..8ec5eeb 100644
--- a/src/libstl/abstract_geometry.h
+++ b/src/c++/libstl/abstract_geometry.h
@@ -1,5 +1,5 @@
-#ifndef FOUG_STL_ABSTRACT_GEOMETRY_H
-#define FOUG_STL_ABSTRACT_GEOMETRY_H
+#ifndef FOUG_CPP_LIBSTL_ABSTRACT_GEOMETRY_H
+#define FOUG_CPP_LIBSTL_ABSTRACT_GEOMETRY_H
 
 #include "stl_global.h"
 
@@ -37,4 +37,4 @@ public:
 } // namespace stl
 } // namespace foug
 
-#endif // FOUG_STL_ABSTRACT_GEOMETRY_H
+#endif // FOUG_CPP_LIBSTL_ABSTRACT_GEOMETRY_H
diff --git a/src/libstl/stl_global.h b/src/c++/libstl/stl_global.h
similarity index 63%
rename from src/libstl/stl_global.h
rename to src/c++/libstl/stl_global.h
index 6891586..34849eb 100644
--- a/src/libstl/stl_global.h
+++ b/src/c++/libstl/stl_global.h
@@ -1,7 +1,7 @@
-#ifndef FOUG_STL_GLOBAL_H
-#define FOUG_STL_GLOBAL_H
+#ifndef FOUG_CPP_LIBSTL_GLOBAL_H
+#define FOUG_CPP_LIBSTL_GLOBAL_H
 
-#include "foug_global.h"
+#include "../foug_global.h"
 
 #ifdef FOUG_STL_DLL
 # ifdef FOUG_STL_MAKE_DLL
@@ -13,4 +13,4 @@
 # define FOUG_STL_EXPORT
 #endif // FOUG_STL_DLL
 
-#endif // FOUG_STL_GLOBAL_H
+#endif // FOUG_CPP_LIBSTL_GLOBAL_H
diff --git a/src/libstl/stla.cpp b/src/c++/libstl/stla.cpp
similarity index 100%
rename from src/libstl/stla.cpp
rename to src/c++/libstl/stla.cpp
diff --git a/src/libstl/stla.h b/src/c++/libstl/stla.h
similarity index 87%
rename from src/libstl/stla.h
rename to src/c++/libstl/stla.h
index f5eb054..a074b83 100644
--- a/src/libstl/stla.h
+++ b/src/c++/libstl/stla.h
@@ -1,5 +1,5 @@
-#ifndef FOUG_STLA_H
-#define FOUG_STLA_H
+#ifndef FOUG_CPP_LIBSTL_STLA_H
+#define FOUG_CPP_LIBSTL_STLA_H
 
 #include "stl_global.h"
 #include "abstract_geometry.h"
@@ -29,4 +29,4 @@ public:
 } // namespace stla
 } // namespace foug
 
-#endif // FOUG_STLA_H
+#endif // FOUG_CPP_LIBSTL_STLA_H
diff --git a/src/libstl/stlb.cpp b/src/c++/libstl/stlb.cpp
similarity index 100%
rename from src/libstl/stlb.cpp
rename to src/c++/libstl/stlb.cpp
diff --git a/src/libstl/stlb.h b/src/c++/libstl/stlb.h
similarity index 90%
rename from src/libstl/stlb.h
rename to src/c++/libstl/stlb.h
index eca87fb..a470f54 100644
--- a/src/libstl/stlb.h
+++ b/src/c++/libstl/stlb.h
@@ -1,5 +1,5 @@
-#ifndef FOUG_STLB_H
-#define FOUG_STLB_H
+#ifndef FOUG_CPP_LIBSTL_STLB_H
+#define FOUG_CPP_LIBSTL_STLB_H
 
 #include "abstract_geometry.h"
 #include "stl_global.h"
@@ -40,4 +40,4 @@ public:
 } // namespace stlb
 } // namespace foug
 
-#endif // FOUG_STLB_H
+#endif // FOUG_CPP_LIBSTL_STLB_H
diff --git a/src/streams/qt4_stream.cpp b/src/c++/streams/qt4_stream.cpp
similarity index 100%
rename from src/streams/qt4_stream.cpp
rename to src/c++/streams/qt4_stream.cpp
diff --git a/src/streams/qt4_stream.h b/src/c++/streams/qt4_stream.h
similarity index 78%
rename from src/streams/qt4_stream.h
rename to src/c++/streams/qt4_stream.h
index e0c9b2c..d54129d 100644
--- a/src/streams/qt4_stream.h
+++ b/src/c++/streams/qt4_stream.h
@@ -1,5 +1,5 @@
-#ifndef FOUG_QT4_STREAM_H
-#define FOUG_QT4_STREAM_H
+#ifndef FOUG_CPP_STREAMS_QT4_STREAM_H
+#define FOUG_CPP_STREAMS_QT4_STREAM_H
 
 #include "../abstract_stream.h"
 class QIODevice;
@@ -27,4 +27,4 @@ private:
 
 } // namespace foug
 
-#endif // FOUG_QT4_STREAM_H
+#endif // FOUG_CPP_STREAMS_QT4_STREAM_H
diff --git a/src/streams/std_io_stream.cpp b/src/c++/streams/std_io_stream.cpp
similarity index 100%
rename from src/streams/std_io_stream.cpp
rename to src/c++/streams/std_io_stream.cpp
diff --git a/src/streams/std_io_stream.h b/src/c++/streams/std_io_stream.h
similarity index 93%
rename from src/streams/std_io_stream.h
rename to src/c++/streams/std_io_stream.h
index 90961dd..003383e 100644
--- a/src/streams/std_io_stream.h
+++ b/src/c++/streams/std_io_stream.h
@@ -1,5 +1,5 @@
-#ifndef FOUG_STD_IO_STREAM_H
-#define FOUG_STD_IO_STREAM_H
+#ifndef FOUG_CPP_STREAMS_STD_IO_STREAM_H
+#define FOUG_CPP_STREAMS_STD_IO_STREAM_H
 
 #include "../abstract_stream.h"
 
@@ -116,4 +116,4 @@ private:
 
 } // namespace foug
 
-#endif // FOUG_STD_IO_STREAM_H
+#endif // FOUG_CPP_STREAMS_STD_IO_STREAM_H