Index: cpp/frams/_demos/conv_test.cpp
===================================================================
--- cpp/frams/_demos/conv_test.cpp	(revision 115)
+++ cpp/frams/_demos/conv_test.cpp	(revision 121)
@@ -1,11 +1,11 @@
-// This file is a part of the Framsticks GDK library.
-// Copyright (C) 2002-2011  Szymon Ulatowski.  See LICENSE.txt for details.
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
 // Refer to http://www.framsticks.com/ for further information.
 
 #include <ctype.h>
-#include <frams/genetic/genoconv.h>
+#include <frams/genetics/genoconv.h>
 #include <frams/model/model.h>
 #include <frams/util/multimap.h>
-#include <frams/genetic/conv/conv_f1.h>
+#include <frams/genetics/f1/conv_f1.h>
 
 #include "printconvmap.h"
Index: cpp/frams/_demos/f0_variants_test.cpp
===================================================================
--- cpp/frams/_demos/f0_variants_test.cpp	(revision 115)
+++ cpp/frams/_demos/f0_variants_test.cpp	(revision 121)
@@ -1,2 +1,6 @@
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
+// Refer to http://www.framsticks.com/ for further information.
+
 #include <stdlib.h>
 #include <stdio.h>
@@ -5,5 +9,5 @@
 
 #include <frams/model/model.h>
-#include <frams/genetic/defgenoconv.h>
+#include <frams/genetics/defgenoconv.h>
 #include <frams/errmgr/stdouterr.h>
 
Index: cpp/frams/_demos/full_props.cpp
===================================================================
--- cpp/frams/_demos/full_props.cpp	(revision 115)
+++ cpp/frams/_demos/full_props.cpp	(revision 121)
@@ -1,4 +1,4 @@
-// This file is a part of the Framsticks GDK library.
-// Copyright (C) 2002-2013  Szymon Ulatowski.  See LICENSE.txt for details.
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
 // Refer to http://www.framsticks.com/ for further information.
 
@@ -9,5 +9,5 @@
 
 #include <frams/model/model.h>
-#include <frams/genetic/defgenoconv.h>
+#include <frams/genetics/defgenoconv.h>
 #include <frams/errmgr/stdouterr.h>
 
Index: cpp/frams/_demos/gdk_test.cpp
===================================================================
--- cpp/frams/_demos/gdk_test.cpp	(revision 115)
+++ cpp/frams/_demos/gdk_test.cpp	(revision 121)
@@ -1,4 +1,4 @@
-// This file is a part of the Framsticks GDK library.
-// Copyright (C) 2002-2011  Szymon Ulatowski.  See LICENSE.txt for details.
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
 // Refer to http://www.framsticks.com/ for further information.
 
@@ -9,5 +9,5 @@
 
 #include <frams/model/model.h>
-#include <frams/genetic/defgenoconv.h>
+#include <frams/genetics/defgenoconv.h>
 #include <frams/errmgr/stdouterr.h>
 
Index: cpp/frams/_demos/geno_test.cpp
===================================================================
--- cpp/frams/_demos/geno_test.cpp	(revision 115)
+++ cpp/frams/_demos/geno_test.cpp	(revision 121)
@@ -1,10 +1,10 @@
-// This file is a part of the Framsticks GDK library.
-// Copyright (C) 2002-2011  Szymon Ulatowski.  See LICENSE.txt for details.
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
 // Refer to http://www.framsticks.com/ for further information.
 
-#include <frams/genetic/geno.h>
+#include <frams/genetics/geno.h>
 #include <frams/virtfile/stdiofile.h>
 #include <frams/util/sstringutils.h>
-#include <frams/genetic/defgenoconv.h>
+#include <frams/genetics/defgenoconv.h>
 
 /**
Index: cpp/frams/_demos/genotypeloader.cpp
===================================================================
--- cpp/frams/_demos/genotypeloader.cpp	(revision 115)
+++ cpp/frams/_demos/genotypeloader.cpp	(revision 121)
@@ -1,4 +1,4 @@
-// This file is a part of the Framsticks GDK library.
-// Copyright (C) 2002-2011  Szymon Ulatowski.  See LICENSE.txt for details.
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
 // Refer to http://www.framsticks.com/ for further information.
 
Index: cpp/frams/_demos/genotypeloader.h
===================================================================
--- cpp/frams/_demos/genotypeloader.h	(revision 115)
+++ cpp/frams/_demos/genotypeloader.h	(revision 121)
@@ -1,4 +1,4 @@
-// This file is a part of the Framsticks GDK library.
-// Copyright (C) 2002-2011  Szymon Ulatowski.  See LICENSE.txt for details.
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
 // Refer to http://www.framsticks.com/ for further information.
 
Index: cpp/frams/_demos/loader_test.cpp
===================================================================
--- cpp/frams/_demos/loader_test.cpp	(revision 115)
+++ cpp/frams/_demos/loader_test.cpp	(revision 121)
@@ -1,4 +1,4 @@
-// This file is a part of the Framsticks GDK library.
-// Copyright (C) 2002-2011  Szymon Ulatowski.  See LICENSE.txt for details.
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
 // Refer to http://www.framsticks.com/ for further information.
 
Index: cpp/frams/_demos/multiline_f0_test.cpp
===================================================================
--- cpp/frams/_demos/multiline_f0_test.cpp	(revision 115)
+++ cpp/frams/_demos/multiline_f0_test.cpp	(revision 121)
@@ -1,2 +1,6 @@
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
+// Refer to http://www.framsticks.com/ for further information.
+
 #include <stdlib.h>
 #include <stdio.h>
@@ -5,5 +9,5 @@
 
 #include <frams/model/model.h>
-#include <frams/genetic/defgenoconv.h>
+#include <frams/genetics/defgenoconv.h>
 #include <frams/errmgr/stdouterr.h>
 #include <frams/virtfile/stringfile.h>
Index: cpp/frams/_demos/neuro_test.cpp
===================================================================
--- cpp/frams/_demos/neuro_test.cpp	(revision 115)
+++ cpp/frams/_demos/neuro_test.cpp	(revision 121)
@@ -1,10 +1,10 @@
-// This file is a part of the Framsticks GDK library.
-// Copyright (C) 2002-2011  Szymon Ulatowski.  See LICENSE.txt for details.
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
 // Refer to http://www.framsticks.com/ for further information.
 
-#include <frams/genetic/geno.h>
+#include <frams/genetics/geno.h>
 #include <frams/virtfile/stdiofile.h>
 #include <frams/util/sstringutils.h>
-#include <frams/genetic/defgenoconv.h>
+#include <frams/genetics/defgenoconv.h>
 #include <frams/neuro/neuroimpl.h>
 #include <frams/neuro/neurofactory.h>
Index: cpp/frams/_demos/part_shapes.cpp
===================================================================
--- cpp/frams/_demos/part_shapes.cpp	(revision 115)
+++ cpp/frams/_demos/part_shapes.cpp	(revision 121)
@@ -1,2 +1,6 @@
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
+// Refer to http://www.framsticks.com/ for further information.
+
 #include <stdio.h>
 #include <frams/model/model.h>
Index: cpp/frams/_demos/printconvmap.cpp
===================================================================
--- cpp/frams/_demos/printconvmap.cpp	(revision 115)
+++ cpp/frams/_demos/printconvmap.cpp	(revision 121)
@@ -1,4 +1,4 @@
-// This file is a part of the Framsticks GDK library.
-// Copyright (C) 2002-2011  Szymon Ulatowski.  See LICENSE.txt for details.
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
 // Refer to http://www.framsticks.com/ for further information.
 
Index: cpp/frams/_demos/printconvmap.h
===================================================================
--- cpp/frams/_demos/printconvmap.h	(revision 115)
+++ cpp/frams/_demos/printconvmap.h	(revision 121)
@@ -1,4 +1,4 @@
-// This file is a part of the Framsticks GDK library.
-// Copyright (C) 2002-2011  Szymon Ulatowski.  See LICENSE.txt for details.
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
 // Refer to http://www.framsticks.com/ for further information.
 
Index: cpp/frams/_demos/serial_test.cpp
===================================================================
--- cpp/frams/_demos/serial_test.cpp	(revision 115)
+++ cpp/frams/_demos/serial_test.cpp	(revision 121)
@@ -1,4 +1,4 @@
-// This file is a part of the Framsticks GDK library.
-// Copyright (C) 2002-2011  Szymon Ulatowski.  See LICENSE.txt for details.
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
 // Refer to http://www.framsticks.com/ for further information.
 
