Index: /trunk/nv/common.hh
===================================================================
--- /trunk/nv/common.hh	(revision 395)
+++ /trunk/nv/common.hh	(revision 395)
@@ -0,0 +1,12 @@
+// Copyright (C) 2012-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries.
+// For conditions of distribution and use, see copying.txt file in root folder.
+
+#ifndef NV_COMMON_HH
+#define NV_COMMON_HH
+
+#include <nv/core/common.hh>
+
+#endif NV_COMMON_HH
Index: /trunk/nv/core/arcball.hh
===================================================================
--- /trunk/nv/core/arcball.hh	(revision 394)
+++ /trunk/nv/core/arcball.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_CORE_ARCBALL_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 
Index: /trunk/nv/core/common.hh
===================================================================
--- /trunk/nv/core/common.hh	(revision 394)
+++ /trunk/nv/core/common.hh	(revision 395)
@@ -1,9 +1,10 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
-#ifndef NV_CORE_COMMON_HH
-#define NV_CORE_COMMON_HH
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
+#ifndef NV_BASE_COMMON_HH
+#define NV_BASE_COMMON_HH
 
 #define _ITERATOR_DEBUG_LEVEL 0
@@ -270,4 +271,4 @@
 #include <nv/stl/rtti_support.hh>
 
-#endif // NV_CORE_COMMON_HH
-
+#endif // NV_BASE_COMMON_HH
+
Index: /trunk/nv/core/config.hh
===================================================================
--- /trunk/nv/core/config.hh	(revision 394)
+++ /trunk/nv/core/config.hh	(revision 395)
@@ -1,8 +1,10 @@
-// Copyright (C) 2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// Copyright (C) 2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
-#ifndef NV_CORE_CONFIG_HH
-#define NV_CORE_CONFIG_HH
+#ifndef NV_BASE_CONFIG_HH
+#define NV_BASE_CONFIG_HH
 
 #define NV_LIB_STATIC  1
@@ -10,3 +12,3 @@
 #define NV_LIB_DYNAMIC 3
 
-#endif // NV_CORE_CONFIG_HH
+#endif // NV_BASE_CONFIG_HH
Index: /trunk/nv/core/io_event.hh
===================================================================
--- /trunk/nv/core/io_event.hh	(revision 394)
+++ /trunk/nv/core/io_event.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_CORE_IO_EVENT_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 namespace nv
Index: /trunk/nv/core/library.hh
===================================================================
--- /trunk/nv/core/library.hh	(revision 394)
+++ /trunk/nv/core/library.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,4 +14,5 @@
 #define NV_CORE_LIBRARY_HH
 
+#include <nv/common.hh>
 #include <nv/stl/exception.hh>
 #include <nv/stl/string.hh>
Index: /trunk/nv/core/logger.hh
===================================================================
--- /trunk/nv/core/logger.hh	(revision 394)
+++ /trunk/nv/core/logger.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,4 +14,5 @@
 #define NV_CORE_LOGGER_HH
 
+#include <nv/common.hh>
 #include <nv/core/logging.hh>
 #include <nv/stl/string.hh>
Index: /trunk/nv/core/logging.hh
===================================================================
--- /trunk/nv/core/logging.hh	(revision 394)
+++ /trunk/nv/core/logging.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_CORE_LOGGING_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/capi.hh>
 #include <nv/stl/string.hh>
Index: /trunk/nv/core/position.hh
===================================================================
--- /trunk/nv/core/position.hh	(revision 394)
+++ /trunk/nv/core/position.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_CORE_POSITION_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <nv/stl/range.hh>
Index: /trunk/nv/core/profiler.hh
===================================================================
--- /trunk/nv/core/profiler.hh	(revision 394)
+++ /trunk/nv/core/profiler.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_CORE_PROFILER_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/singleton.hh>
 #include <nv/stl/string.hh>
Index: /trunk/nv/core/property_store.hh
===================================================================
--- /trunk/nv/core/property_store.hh	(revision 394)
+++ /trunk/nv/core/property_store.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_CORE_PROPERTY_STORE_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/handle.hh>
 
Index: /trunk/nv/core/random.hh
===================================================================
--- /trunk/nv/core/random.hh	(revision 394)
+++ /trunk/nv/core/random.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_CORE_RANDOM_HH
 #define NV_CORE_RANDOM_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <nv/stl/type_traits/primary.hh>
Index: /trunk/nv/core/time.hh
===================================================================
--- /trunk/nv/core/time.hh	(revision 394)
+++ /trunk/nv/core/time.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 /**
  * @file time.hh
@@ -13,5 +13,5 @@
 #define NV_CORE_TIME_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 namespace nv
Index: /trunk/nv/core/transform.hh
===================================================================
--- /trunk/nv/core/transform.hh	(revision 394)
+++ /trunk/nv/core/transform.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_CORE_TRANSFORM_HH
 #define NV_CORE_TRANSFORM_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 
Index: /trunk/nv/core/types.hh
===================================================================
--- /trunk/nv/core/types.hh	(revision 394)
+++ /trunk/nv/core/types.hh	(revision 395)
@@ -1,10 +1,12 @@
 // Copyright (C) 2014 Kornel Kisielewicz
-// This file is part of Nova Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_CORE_TYPES_HH
 #define NV_CORE_TYPES_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <nv/stl/memory.hh>
Index: /trunk/nv/core/uid.hh
===================================================================
--- /trunk/nv/core/uid.hh	(revision 394)
+++ /trunk/nv/core/uid.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_CORE_UID_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/unordered_map.hh>
 
Index: /trunk/nv/curses/curses_terminal.hh
===================================================================
--- /trunk/nv/curses/curses_terminal.hh	(revision 394)
+++ /trunk/nv/curses/curses_terminal.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2013-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 /**
  * @file curses_terminal.hh
@@ -13,5 +13,5 @@
 #define NV_CURSES_TERMINAL_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/interface/terminal.hh>
 #include <nv/core/io_event.hh>
Index: /trunk/nv/engine/particle_engine.hh
===================================================================
--- /trunk/nv/engine/particle_engine.hh	(revision 394)
+++ /trunk/nv/engine/particle_engine.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
-
-#ifndef NV_GFX_PARTICLE_ENGINE
-#define NV_GFX_PARTICLE_ENGINE
-
-#include <nv/core/common.hh>
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
+#ifndef NV_ENGINE_PARTICLE_ENGINE
+#define NV_ENGINE_PARTICLE_ENGINE
+
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <nv/stl/vector.hh>
@@ -203,3 +203,3 @@
 }
 
-#endif // NV_GFX_PARTICLE_ENGINE
+#endif // NV_ENGINE_PARTICLE_ENGINE
Index: /trunk/nv/engine/program_manager.hh
===================================================================
--- /trunk/nv/engine/program_manager.hh	(revision 394)
+++ /trunk/nv/engine/program_manager.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_ENGINE_PROGRAM_MANAGER_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/engine/resource_system.hh>
 
Index: /trunk/nv/engine/resource_system.hh
===================================================================
--- /trunk/nv/engine/resource_system.hh	(revision 394)
+++ /trunk/nv/engine/resource_system.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_ENGINE_RESOURCE_MANAGER_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/interface/context.hh>
 #include <nv/lua/lua_state.hh>
Index: /trunk/nv/fmod/fmod_audio.hh
===================================================================
--- /trunk/nv/fmod/fmod_audio.hh	(revision 394)
+++ /trunk/nv/fmod/fmod_audio.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file fmod_audio.hh
@@ -13,5 +14,5 @@
 #define NV_FMOD_AUDIO_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/interface/audio.hh>
 
Index: /trunk/nv/formats/assimp_loader.hh
===================================================================
--- /trunk/nv/formats/assimp_loader.hh	(revision 394)
+++ /trunk/nv/formats/assimp_loader.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
-#ifndef NV_ASSIMP_LOADER_HH
-#define NV_ASSIMP_LOADER_HH
+#ifndef NV_FORMATS_ASSIMP_LOADER_HH
+#define NV_FORMATS_ASSIMP_LOADER_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/io/string_table.hh>
 #include <nv/interface/mesh_loader.hh>
@@ -46,3 +46,3 @@
 }
 
-#endif // NV_ASSIMP_LOADER_HH
+#endif // NV_FORMATS_ASSIMP_LOADER_HH
Index: /trunk/nv/formats/md2_loader.hh
===================================================================
--- /trunk/nv/formats/md2_loader.hh	(revision 394)
+++ /trunk/nv/formats/md2_loader.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -11,8 +11,8 @@
  */
 
-#ifndef NV_MD2_LOADER_HH
-#define NV_MD2_LOADER_HH
+#ifndef NV_FORMATS_MD2_LOADER_HH
+#define NV_FORMATS_MD2_LOADER_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/vector.hh>
 #include <nv/interface/mesh_loader.hh>
@@ -43,3 +43,3 @@
 }
 
-#endif // NV_MD2_LOADER_HH
+#endif // NV_FORMATS_MD2_LOADER_HH
Index: /trunk/nv/formats/md3_loader.hh
===================================================================
--- /trunk/nv/formats/md3_loader.hh	(revision 394)
+++ /trunk/nv/formats/md3_loader.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -11,8 +11,8 @@
  */
 
-#ifndef NV_MD3_LOADER_HH
-#define NV_MD3_LOADER_HH
+#ifndef NV_FORMATS_MD3_LOADER_HH
+#define NV_FORMATS_MD3_LOADER_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/core/transform.hh>
 #include <nv/interface/mesh_data.hh>
@@ -48,3 +48,3 @@
 }
 
-#endif // NV_OBJ_LOADER_HH
+#endif // NV_FORMATS_MD3_LOADER_HH
Index: /trunk/nv/formats/md5_loader.hh
===================================================================
--- /trunk/nv/formats/md5_loader.hh	(revision 394)
+++ /trunk/nv/formats/md5_loader.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -11,8 +11,8 @@
  */
 
-#ifndef NV_MD5_LOADER_HH
-#define NV_MD5_LOADER_HH
+#ifndef NV_FORMATS_MD5_LOADER_HH
+#define NV_FORMATS_MD5_LOADER_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/array.hh>
 #include <nv/interface/mesh_loader.hh>
@@ -94,3 +94,3 @@
 }
 
-#endif // NV_MD5_LOADER_HH
+#endif // NV_FORMATS_MD5_LOADER_HH
Index: /trunk/nv/formats/nmd_loader.hh
===================================================================
--- /trunk/nv/formats/nmd_loader.hh	(revision 394)
+++ /trunk/nv/formats/nmd_loader.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
-#ifndef NV_NMD_LOADER_HH
-#define NV_NMD_LOADER_HH
+#ifndef NV_FORMATS_NMD_LOADER_HH
+#define NV_FORMATS_NMD_LOADER_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/interface/mesh_loader.hh>
 #include <nv/interface/mesh_data.hh>
@@ -97,3 +97,3 @@
 }
 
-#endif // NV_NMD_LOADER_HH
+#endif // NV_FORMATS_NMD_LOADER_HH
Index: /trunk/nv/formats/obj_loader.hh
===================================================================
--- /trunk/nv/formats/obj_loader.hh	(revision 394)
+++ /trunk/nv/formats/obj_loader.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -11,8 +11,8 @@
  */
 
-#ifndef NV_OBJ_LOADER_HH
-#define NV_OBJ_LOADER_HH
+#ifndef NV_FORMATS_OBJ_LOADER_HH
+#define NV_FORMATS_OBJ_LOADER_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/interface/mesh_loader.hh>
 #include <nv/interface/mesh_data.hh>
@@ -40,3 +40,3 @@
 }
 
-#endif // NV_OBJ_LOADER_HH
+#endif // NV_FORMATS_OBJ_LOADER_HH
Index: /trunk/nv/gfx/animation.hh
===================================================================
--- /trunk/nv/gfx/animation.hh	(revision 394)
+++ /trunk/nv/gfx/animation.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
-
-#ifndef NV_ANIMATION_HH
-#define NV_ANIMATION_HH
-
-#include <nv/core/common.hh>
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
+#ifndef NV_GFX_ANIMATION_HH
+#define NV_GFX_ANIMATION_HH
+
+#include <nv/common.hh>
 #include <nv/stl/vector.hh>
 #include <nv/interface/stream.hh>
@@ -401,3 +401,3 @@
 }
 
-#endif // NV_ANIMATION_HH
+#endif // NV_GFX_ANIMATION_HH
Index: /trunk/nv/gfx/debug_draw.hh
===================================================================
--- /trunk/nv/gfx/debug_draw.hh	(revision 394)
+++ /trunk/nv/gfx/debug_draw.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
-#ifndef NV_DEBUG_DRAW_HH
-#define NV_DEBUG_DRAW_HH
+#ifndef NV_GFX_DEBUG_DRAW_HH
+#define NV_GFX_DEBUG_DRAW_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <nv/stl/vector.hh>
@@ -46,3 +46,3 @@
 }
 
-#endif // NV_DEBUG_DRAW_HH
+#endif // NV_GFX_DEBUG_DRAW_HH
Index: /trunk/nv/gfx/image.hh
===================================================================
--- /trunk/nv/gfx/image.hh	(revision 394)
+++ /trunk/nv/gfx/image.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
-#ifndef NV_IMAGE_HH
-#define NV_IMAGE_HH
+#ifndef NV_GFX_IMAGE_HH
+#define NV_GFX_IMAGE_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <nv/interface/image_data.hh>
@@ -123,4 +123,4 @@
 }
 
-#endif // NV_IMAGE_HH
+#endif // NV_GFX_IMAGE_HH
 
Index: /trunk/nv/gfx/keyframed_mesh.hh
===================================================================
--- /trunk/nv/gfx/keyframed_mesh.hh	(revision 394)
+++ /trunk/nv/gfx/keyframed_mesh.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
-#ifndef NV_KEYFRAMED_MESH_HH
-#define NV_KEYFRAMED_MESH_HH
+#ifndef NV_GFX_KEYFRAMED_MESH_HH
+#define NV_GFX_KEYFRAMED_MESH_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/interface/context.hh>
 #include <nv/interface/animated_mesh.hh>
@@ -97,3 +97,3 @@
 } // namespace nv
 
-#endif // NV_KEYFRAMED_MESH_HH
+#endif // NV_GFX_KEYFRAMED_MESH_HH
Index: /trunk/nv/gfx/mesh_creator.hh
===================================================================
--- /trunk/nv/gfx/mesh_creator.hh	(revision 394)
+++ /trunk/nv/gfx/mesh_creator.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
-#ifndef NV_MESH_CREATOR_HH
-#define NV_MESH_CREATOR_HH
+#ifndef NV_GFX_MESH_CREATOR_HH
+#define NV_GFX_MESH_CREATOR_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <nv/interface/mesh_data.hh>
@@ -106,3 +106,3 @@
 }
 
-#endif // NV_MESH_CREATOR_HH
+#endif // NV_GFX_MESH_CREATOR_HH
Index: /trunk/nv/gfx/skeletal_mesh.hh
===================================================================
--- /trunk/nv/gfx/skeletal_mesh.hh	(revision 394)
+++ /trunk/nv/gfx/skeletal_mesh.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
-#ifndef NV_SKELETAL_MESH_HH
-#define NV_SKELETAL_MESH_HH
+#ifndef NV_GFX_SKELETAL_MESH_HH
+#define NV_GFX_SKELETAL_MESH_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/interface/context.hh>
 #include <nv/interface/animated_mesh.hh>
@@ -115,3 +115,3 @@
 } // namespace nv
 
-#endif // NV_SKELETAL_MESH_HH
+#endif // NV_GFX_SKELETAL_MESH_HH
Index: /trunk/nv/gfx/sliced_buffer.hh
===================================================================
--- /trunk/nv/gfx/sliced_buffer.hh	(revision 394)
+++ /trunk/nv/gfx/sliced_buffer.hh	(revision 395)
@@ -1,15 +1,15 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 // TODO : Force no resize on the buffer_slice!
 // TODO : Multiple update support?
 
-#ifndef NV_SLICED_BUFFER_HH
-#define NV_SLICED_BUFFER_HH
-
-#include <nv/core/common.hh>
+#ifndef NV_GFX_SLICED_BUFFER_HH
+#define NV_GFX_SLICED_BUFFER_HH
+
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <vector> // TODO: remove
@@ -310,3 +310,3 @@
 } // namespace nv
 
-#endif // NV_SLICED_BUFFER_HH
+#endif // NV_GFX_SLICED_BUFFER_HH
Index: /trunk/nv/gfx/texture_atlas.hh
===================================================================
--- /trunk/nv/gfx/texture_atlas.hh	(revision 394)
+++ /trunk/nv/gfx/texture_atlas.hh	(revision 395)
@@ -1,14 +1,14 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 //
 // TODO: fix behavior for exact fits (1024^2 atlas with border 0 only holds 9 256^2 images...)
 
-#ifndef NV_TEXTURE_ATLAS_HH
-#define NV_TEXTURE_ATLAS_HH
+#ifndef NV_GFX_TEXTURE_ATLAS_HH
+#define NV_GFX_TEXTURE_ATLAS_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <nv/gfx/image.hh>
@@ -37,4 +37,4 @@
 }
 
-#endif // NV_TEXTURE_ATLAS_HH
+#endif // NV_GFX_TEXTURE_ATLAS_HH
 
Index: /trunk/nv/gfx/texture_font.hh
===================================================================
--- /trunk/nv/gfx/texture_font.hh	(revision 394)
+++ /trunk/nv/gfx/texture_font.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
-#ifndef NV_TEXTURE_FONT_HH
-#define NV_TEXTURE_FONT_HH
+#ifndef NV_GFX_TEXTURE_FONT_HH
+#define NV_GFX_TEXTURE_FONT_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/string.hh>
 #include <nv/stl/unordered_map.hh>
@@ -68,4 +68,4 @@
 }
 
-#endif // NV_TEXTURE_FONT_HH
+#endif // NV_GFX_TEXTURE_FONT_HH
 
Index: /trunk/nv/gl/gl_context.hh
===================================================================
--- /trunk/nv/gl/gl_context.hh	(revision 394)
+++ /trunk/nv/gl/gl_context.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file gl_context.hh
Index: /trunk/nv/gl/gl_device.hh
===================================================================
--- /trunk/nv/gl/gl_device.hh	(revision 394)
+++ /trunk/nv/gl/gl_device.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file gl_device.hh
Index: /trunk/nv/gl/gl_enum.hh
===================================================================
--- /trunk/nv/gl/gl_enum.hh	(revision 394)
+++ /trunk/nv/gl/gl_enum.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file gl_enum.hh
Index: /trunk/nv/gl/gl_window.hh
===================================================================
--- /trunk/nv/gl/gl_window.hh	(revision 394)
+++ /trunk/nv/gl/gl_window.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file gl_window.hh
Index: /trunk/nv/gui/gui_ascii_renderer.hh
===================================================================
--- /trunk/nv/gui/gui_ascii_renderer.hh	(revision 394)
+++ /trunk/nv/gui/gui_ascii_renderer.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,4 +14,5 @@
 #define NV_GUI_ASCII_RENDERER_HH
 
+#include <nv/common.hh>
 #include <nv/core/position.hh>
 #include <nv/stl/math.hh>
Index: /trunk/nv/gui/gui_common.hh
===================================================================
--- /trunk/nv/gui/gui_common.hh	(revision 394)
+++ /trunk/nv/gui/gui_common.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_GUI_COMMON_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/handle.hh>
 #include <nv/stl/flags.hh>
Index: /trunk/nv/gui/gui_element.hh
===================================================================
--- /trunk/nv/gui/gui_element.hh	(revision 394)
+++ /trunk/nv/gui/gui_element.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_GUI_ELEMENT_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/core/position.hh>
 #include <nv/core/io_event.hh>
Index: /trunk/nv/gui/gui_environment.hh
===================================================================
--- /trunk/nv/gui/gui_environment.hh	(revision 394)
+++ /trunk/nv/gui/gui_environment.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
Index: /trunk/nv/gui/gui_gfx_renderer.hh
===================================================================
--- /trunk/nv/gui/gui_gfx_renderer.hh	(revision 394)
+++ /trunk/nv/gui/gui_gfx_renderer.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
Index: /trunk/nv/gui/gui_renderer.hh
===================================================================
--- /trunk/nv/gui/gui_renderer.hh	(revision 394)
+++ /trunk/nv/gui/gui_renderer.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,4 +14,5 @@
 #define NV_GUI_RENDERER_HH
 
+#include <nv/common.hh>
 #include <nv/core/position.hh>
 #include <nv/stl/math.hh>
Index: /trunk/nv/gui/gui_style.hh
===================================================================
--- /trunk/nv/gui/gui_style.hh	(revision 394)
+++ /trunk/nv/gui/gui_style.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
  * @file gui_style.hh
  * @author Kornel Kisielewicz
- * @brief GUI Styue
+ * @brief GUI style
  */
 
Index: /trunk/nv/interface/animated_mesh.hh
===================================================================
--- /trunk/nv/interface/animated_mesh.hh	(revision 394)
+++ /trunk/nv/interface/animated_mesh.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -11,8 +11,8 @@
  */
 
-#ifndef NV_ANIMATED_MESH_HH
-#define NV_ANIMATED_MESH_HH
+#ifndef NV_INTERFACE_ANIMATED_MESH_HH
+#define NV_INTERFACE_ANIMATED_MESH_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <nv/core/transform.hh>
@@ -69,3 +69,3 @@
 }
 
-#endif // NV_ANIMATED_MESH_HH
+#endif // NV_INTERFACE_ANIMATED_MESH_HH
Index: /trunk/nv/interface/animation_key.hh
===================================================================
--- /trunk/nv/interface/animation_key.hh	(revision 394)
+++ /trunk/nv/interface/animation_key.hh	(revision 395)
@@ -1,14 +1,14 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 // WARNING: this file is explicitly designed to fuck with your brain
 
-#ifndef NV_ANIMATION_KEY_HH
-#define NV_ANIMATION_KEY_HH
-
-#include <nv/core/common.hh>
+#ifndef NV_INTERFACE_ANIMATION_KEY_HH
+#define NV_INTERFACE_ANIMATION_KEY_HH
+
+#include <nv/common.hh>
 #include <nv/core/transform.hh>
 #include <nv/stl/math.hh>
@@ -241,3 +241,3 @@
 }
 
-#endif // NV_ANIMATION_KEY_HH
+#endif // NV_INTERFACE_ANIMATION_KEY_HH
Index: /trunk/nv/interface/audio.hh
===================================================================
--- /trunk/nv/interface/audio.hh	(revision 394)
+++ /trunk/nv/interface/audio.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file audio.hh
@@ -10,8 +11,8 @@
  */
 
-#ifndef NV_AUDIO_HH
-#define NV_AUDIO_HH
+#ifndef NV_INTERFACE_AUDIO_HH
+#define NV_INTERFACE_AUDIO_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/string.hh>
 #include <nv/stl/math.hh>
@@ -40,3 +41,3 @@
 }
 
-#endif // NV_AUDIO_HH
+#endif // NV_INTERFACE_AUDIO_HH
Index: /trunk/nv/interface/camera.hh
===================================================================
--- /trunk/nv/interface/camera.hh	(revision 394)
+++ /trunk/nv/interface/camera.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file camera.hh
@@ -10,8 +11,8 @@
  */
 
-#ifndef NV_CAMERA_HH
-#define NV_CAMERA_HH
+#ifndef NV_INTERFACE_CAMERA_HH
+#define NV_INTERFACE_CAMERA_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 
@@ -90,3 +91,3 @@
 }
 
-#endif // NV_CAMERA_HH
+#endif // NV_INTERFACE_CAMERA_HH
Index: /trunk/nv/interface/clear_state.hh
===================================================================
--- /trunk/nv/interface/clear_state.hh	(revision 394)
+++ /trunk/nv/interface/clear_state.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -11,8 +11,8 @@
  */
 
-#ifndef NV_CLEAR_STATE_HH
-#define NV_CLEAR_STATE_HH
+#ifndef NV_INTERFACE_CLEAR_STATE_HH
+#define NV_INTERFACE_CLEAR_STATE_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 
@@ -85,3 +85,3 @@
 
 
-#endif // NV_CLEAR_STATE_HH
+#endif // NV_INTERFACE_CLEAR_STATE_HH
Index: /trunk/nv/interface/context.hh
===================================================================
--- /trunk/nv/interface/context.hh	(revision 394)
+++ /trunk/nv/interface/context.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file context.hh
@@ -10,8 +11,8 @@
  */
 
-#ifndef NV_CONTEXT_HH
-#define NV_CONTEXT_HH
-
-#include <nv/core/common.hh>
+#ifndef NV_INTERFACE_CONTEXT_HH
+#define NV_INTERFACE_CONTEXT_HH
+
+#include <nv/common.hh>
 #include <nv/interface/device.hh>
 #include <nv/interface/camera.hh>
@@ -333,3 +334,3 @@
 } // namespace nv
 
-#endif // NV_CONTEXT_HH
+#endif // NV_INTERFACE_CONTEXT_HH
Index: /trunk/nv/interface/device.hh
===================================================================
--- /trunk/nv/interface/device.hh	(revision 394)
+++ /trunk/nv/interface/device.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file device.hh
@@ -10,8 +11,8 @@
  */
 
-#ifndef NV_DEVICE_HH
-#define NV_DEVICE_HH
-
-#include <nv/core/common.hh>
+#ifndef NV_INTERFACE_DEVICE_HH
+#define NV_INTERFACE_DEVICE_HH
+
+#include <nv/common.hh>
 #include <nv/stl/string.hh>
 #include <nv/stl/handle.hh>
@@ -295,3 +296,3 @@
 
 
-#endif // NV_DEVICE_HH
+#endif // NV_INTERFACE_DEVICE_HH
Index: /trunk/nv/interface/file_system.hh
===================================================================
--- /trunk/nv/interface/file_system.hh	(revision 394)
+++ /trunk/nv/interface/file_system.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 /**
  * @file stream.hh
@@ -10,8 +10,8 @@
  */
 
-#ifndef NV_FILE_SYSTEM_HH
-#define NV_FILE_SYSTEM_HH
+#ifndef NV_INTERFACE_FILE_SYSTEM_HH
+#define NV_INTERFACE_FILE_SYSTEM_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/interface/stream.hh>
 
Index: /trunk/nv/interface/font.hh
===================================================================
--- /trunk/nv/interface/font.hh	(revision 394)
+++ /trunk/nv/interface/font.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
-#ifndef NV_GL_FONT_HH
-#define NV_GL_FONT_HH
+#ifndef NV_INTERFACE_FONT_HH
+#define NV_INTERFACE_FONT_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <nv/stl/unordered_map.hh>
@@ -39,3 +39,3 @@
 }
 
-#endif // NV_GL_FONT_HH
+#endif // NV_INTERFACE_FONT_HH
Index: /trunk/nv/interface/image_data.hh
===================================================================
--- /trunk/nv/interface/image_data.hh	(revision 394)
+++ /trunk/nv/interface/image_data.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -11,8 +11,8 @@
  */
 
-#ifndef NV_IMAGE_DATA_HH
-#define NV_IMAGE_DATA_HH
+#ifndef NV_INTERFACE_IMAGE_DATA_HH
+#define NV_INTERFACE_IMAGE_DATA_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <algorithm>
@@ -67,3 +67,3 @@
 }
 
-#endif // NV_IMAGE_DATA_HH
+#endif // NV_INTERFACE_IMAGE_DATA_HH
Index: /trunk/nv/interface/input.hh
===================================================================
--- /trunk/nv/interface/input.hh	(revision 394)
+++ /trunk/nv/interface/input.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file input.hh
@@ -10,8 +11,8 @@
  */
 
-#ifndef NV_INPUT_HH
-#define NV_INPUT_HH
+#ifndef NV_INTERFACE_INPUT_HH
+#define NV_INTERFACE_INPUT_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/core/io_event.hh>
 
@@ -29,3 +30,3 @@
 }
 
-#endif // NV_INPUT_HH
+#endif // NV_INTERFACE_INPUT_HH
Index: /trunk/nv/interface/interpolation_raw.hh
===================================================================
--- /trunk/nv/interface/interpolation_raw.hh	(revision 394)
+++ /trunk/nv/interface/interpolation_raw.hh	(revision 395)
@@ -1,14 +1,14 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 // WARNING: this file is explicitly designed to fuck with your brain
 
-#ifndef NV_INTERPOLATION_RAW_HH
-#define NV_INTERPOLATION_RAW_HH
+#ifndef NV_INTERFACE_INTERPOLATION_RAW_HH
+#define NV_INTERFACE_INTERPOLATION_RAW_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/core/transform.hh>
 #include <nv/stl/math.hh>
@@ -181,3 +181,3 @@
 }
 
-#endif // NV_INTERPOLATION_RAW_HH
+#endif // NV_INTERFACE_INTERPOLATION_RAW_HH
Index: /trunk/nv/interface/interpolation_template.hh
===================================================================
--- /trunk/nv/interface/interpolation_template.hh	(revision 394)
+++ /trunk/nv/interface/interpolation_template.hh	(revision 395)
@@ -1,14 +1,14 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 // WARNING: this file is explicitly designed to fuck with your brain
 
-#ifndef NV_INTERPOLATION_TEMPLATE_HH
-#define NV_INTERPOLATION_TEMPLATE_HH
+#ifndef NV_INTERFACE_INTERPOLATION_TEMPLATE_HH
+#define NV_INTERFACE_INTERPOLATION_TEMPLATE_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/core/transform.hh>
 #include <nv/stl/math.hh>
@@ -177,3 +177,3 @@
 }
 
-#endif // NV_INTERPOLATION_TEMPLATE_HH
+#endif // NV_INTERFACE_INTERPOLATION_TEMPLATE_HH
Index: /trunk/nv/interface/map_area.hh
===================================================================
--- /trunk/nv/interface/map_area.hh	(revision 394)
+++ /trunk/nv/interface/map_area.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -10,8 +10,8 @@
  */
 
-#ifndef NV_MAP_AREA_HH
-#define NV_MAP_AREA_HH
+#ifndef NV_INTERFACE_MAP_AREA_HH
+#define NV_INTERFACE_MAP_AREA_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/core/position.hh>
 #include <nv/stl/string.hh>
@@ -62,3 +62,3 @@
 }
 
-#endif // NV_MAP_AREA_HH
+#endif // NV_INTERFACE_MAP_AREA_HH
Index: /trunk/nv/interface/mesh_data.hh
===================================================================
--- /trunk/nv/interface/mesh_data.hh	(revision 394)
+++ /trunk/nv/interface/mesh_data.hh	(revision 395)
@@ -2,11 +2,11 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
-
-#ifndef NV_MESH_DATA_HH
-#define NV_MESH_DATA_HH
-
-#include <nv/core/common.hh>
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
+#ifndef NV_INTERFACE_MESH_DATA_HH
+#define NV_INTERFACE_MESH_DATA_HH
+
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <nv/stl/string.hh>
@@ -338,3 +338,3 @@
 }
 
-#endif // NV_MESH_DATA_HH
+#endif // NV_INTERFACE_MESH_DATA_HH
Index: /trunk/nv/interface/mesh_loader.hh
===================================================================
--- /trunk/nv/interface/mesh_loader.hh	(revision 394)
+++ /trunk/nv/interface/mesh_loader.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -11,8 +11,8 @@
  */
 
-#ifndef NV_MESH_LOADER_HH
-#define NV_MESH_LOADER_HH
+#ifndef NV_INTERFACE_MESH_LOADER_HH
+#define NV_INTERFACE_MESH_LOADER_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/core/transform.hh>
 #include <nv/stl/string.hh>
@@ -39,4 +39,4 @@
 }
 
-#endif // NV_MESH_LOADER_HH
+#endif // NV_INTERFACE_MESH_LOADER_HH
 
Index: /trunk/nv/interface/render_state.hh
===================================================================
--- /trunk/nv/interface/render_state.hh	(revision 394)
+++ /trunk/nv/interface/render_state.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -11,8 +11,8 @@
  */
 
-#ifndef NV_RENDER_STATE_HH
-#define NV_RENDER_STATE_HH
-
-#include <nv/core/common.hh>
+#ifndef NV_INTERFACE_RENDER_STATE_HH
+#define NV_INTERFACE_RENDER_STATE_HH
+
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <nv/interface/clear_state.hh>
@@ -206,3 +206,3 @@
 
 
-#endif // NV_RENDER_STATE_HH
+#endif // NV_INTERFACE_RENDER_STATE_HH
Index: /trunk/nv/interface/scene_node.hh
===================================================================
--- /trunk/nv/interface/scene_node.hh	(revision 394)
+++ /trunk/nv/interface/scene_node.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file scene_node.hh
@@ -10,8 +11,8 @@
  */
 
-#ifndef NV_SCENE_NODE_HH
-#define NV_SCENE_NODE_HH
+#ifndef NV_INTERFACE_SCENE_NODE_HH
+#define NV_INTERFACE_SCENE_NODE_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/vector.hh>
 #include <nv/core/transform.hh>
@@ -93,3 +94,3 @@
 }
 
-#endif // NV_SCENE_NODE_HH
+#endif // NV_INTERFACE_SCENE_NODE_HH
Index: /trunk/nv/interface/stream.hh
===================================================================
--- /trunk/nv/interface/stream.hh	(revision 394)
+++ /trunk/nv/interface/stream.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file stream.hh
@@ -10,8 +11,8 @@
  */
 
-#ifndef NV_STREAM_HH
-#define NV_STREAM_HH
+#ifndef NV_INTERFACE_STREAM_HH
+#define NV_INTERFACE_STREAM_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 namespace nv
@@ -41,3 +42,3 @@
 } // namespace nv
 
-#endif // NV_STREAM_HH
+#endif // NV_INTERFACE_STREAM_HH
Index: /trunk/nv/interface/terminal.hh
===================================================================
--- /trunk/nv/interface/terminal.hh	(revision 394)
+++ /trunk/nv/interface/terminal.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2013-2014 ChaosForge Ltd
+// Copyright (C) 2013-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file terminal.hh
@@ -10,8 +11,8 @@
  */
 
-#ifndef NV_TERMINAL_HH
-#define NV_TERMINAL_HH
+#ifndef NV_INTERFACE_TERMINAL_HH
+#define NV_INTERFACE_TERMINAL_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/core/position.hh>
 #include <nv/core/io_event.hh>
@@ -93,3 +94,3 @@
 }
 
-#endif // NV_TERMINAL_HH
+#endif // NV_INTERFACE_TERMINAL_HH
Index: /trunk/nv/interface/uniform.hh
===================================================================
--- /trunk/nv/interface/uniform.hh	(revision 394)
+++ /trunk/nv/interface/uniform.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file uniform.hh
@@ -10,9 +11,9 @@
  */
 
-#ifndef NV_UNIFORM_HH
-#define NV_UNIFORM_HH
-
+#ifndef NV_INTERFACE_UNIFORM_HH
+#define NV_INTERFACE_UNIFORM_HH
+
+#include <nv/common.hh>
 #include <nv/interface/camera.hh>
-#include <nv/core/common.hh>
 #include <nv/stl/string.hh>
 #include <nv/stl/unordered_map.hh>
@@ -269,3 +270,3 @@
 }
 
-#endif // NV_UNIFORM_HH
+#endif // NV_INTERFACE_UNIFORM_HH
Index: /trunk/nv/interface/vertex.hh
===================================================================
--- /trunk/nv/interface/vertex.hh	(revision 394)
+++ /trunk/nv/interface/vertex.hh	(revision 395)
@@ -1,14 +1,14 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 // WARNING: this file is explicitly designed to fuck with your brain
 
-#ifndef NV_VERTEX_HH
-#define NV_VERTEX_HH
-
-#include <nv/core/common.hh>
+#ifndef NV_INTERFACE_VERTEX_HH
+#define NV_INTERFACE_VERTEX_HH
+
+#include <nv/common.hh>
 #include <nv/core/transform.hh>
 #include <nv/stl/math.hh>
@@ -311,3 +311,3 @@
 }
 
-#endif // NV_VERTEX_HH
+#endif // NV_INTERFACE_VERTEX_HH
Index: /trunk/nv/interface/window.hh
===================================================================
--- /trunk/nv/interface/window.hh	(revision 394)
+++ /trunk/nv/interface/window.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file window.hh
@@ -10,8 +11,8 @@
  */
 
-#ifndef NV_WINDOW_HH
-#define NV_WINDOW_HH
+#ifndef NV_INTERFACE_WINDOW_HH
+#define NV_INTERFACE_WINDOW_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/core/io_event.hh>
 #include <nv/stl/string.hh>
@@ -42,3 +43,3 @@
 
 
-#endif // NV_WINDOW_HH
+#endif // NV_INTERFACE_WINDOW_HH
Index: /trunk/nv/interface/window_manager.hh
===================================================================
--- /trunk/nv/interface/window_manager.hh	(revision 394)
+++ /trunk/nv/interface/window_manager.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file window_manager.hh
@@ -10,8 +11,8 @@
  */
 
-#ifndef NV_WINDOW_MANAGER_HH
-#define NV_WINDOW_MANAGER_HH
+#ifndef NV_INTERFACE_WINDOW_MANAGER_HH
+#define NV_INTERFACE_WINDOW_MANAGER_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/string.hh>
 
@@ -35,3 +36,3 @@
 }
 
-#endif // NV_WINDOW_MANAGER_HH
+#endif // NV_INTERFACE_WINDOW_MANAGER_HH
Index: /trunk/nv/io/c_file_system.hh
===================================================================
--- /trunk/nv/io/c_file_system.hh	(revision 394)
+++ /trunk/nv/io/c_file_system.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file stream.hh
@@ -10,8 +11,8 @@
  */
 
-#ifndef NV_C_FILE_SYSTEM_HH
-#define NV_C_FILE_SYSTEM_HH
+#ifndef NV_IO_C_FILE_SYSTEM_HH
+#define NV_IO_C_FILE_SYSTEM_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/interface/file_system.hh>
 
Index: /trunk/nv/io/c_stream.hh
===================================================================
--- /trunk/nv/io/c_stream.hh	(revision 394)
+++ /trunk/nv/io/c_stream.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file c_stream.hh
@@ -10,8 +11,8 @@
  */
 
-#ifndef NV_C_STREAM_HH
-#define NV_C_STREAM_HH
+#ifndef NV_IO_C_STREAM_HH
+#define NV_IO_C_STREAM_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/interface/stream.hh>
 
@@ -42,3 +43,3 @@
 } // namespace nv
 
-#endif // NV_C_STREAM_HH
+#endif // NV_IO_C_STREAM_HH
Index: /trunk/nv/io/std_stream.hh
===================================================================
--- /trunk/nv/io/std_stream.hh	(revision 394)
+++ /trunk/nv/io/std_stream.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file std_stream.hh
@@ -10,8 +11,8 @@
  */
 
-#ifndef NV_STD_STREAM_HH
-#define NV_STD_STREAM_HH
+#ifndef NV_IO_STD_STREAM_HH
+#define NV_IO_STD_STREAM_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/interface/stream.hh>
 #include <streambuf>
@@ -51,3 +52,3 @@
 } // namespace nv
 
-#endif // NV_STD_STREAM_HH
+#endif // NV_IO_STD_STREAM_HH
Index: /trunk/nv/io/string_table.hh
===================================================================
--- /trunk/nv/io/string_table.hh	(revision 394)
+++ /trunk/nv/io/string_table.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -13,5 +13,5 @@
 #define NV_IO_STRING_TABLE_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/vector.hh>
 #include <nv/stl/string.hh>
Index: /trunk/nv/lib/assimp.hh
===================================================================
--- /trunk/nv/lib/assimp.hh	(revision 394)
+++ /trunk/nv/lib/assimp.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2014 ChaosForge Ltd 
+// Copyright (C) 2014-2015 ChaosForge Ltd 
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_LIB_ASSIMP_HH
 #define NV_LIB_ASSIMP_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/core/logging.hh>
 #include <nv/stl/string.hh>
Index: /trunk/nv/lib/curses.hh
===================================================================
--- /trunk/nv/lib/curses.hh	(revision 394)
+++ /trunk/nv/lib/curses.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_LIB_CURSES_HH
 #define NV_LIB_CURSES_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 #define NV_CURSES_DYNAMIC
Index: /trunk/nv/lib/fmod.hh
===================================================================
--- /trunk/nv/lib/fmod.hh	(revision 394)
+++ /trunk/nv/lib/fmod.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_LIB_FMOD_HH
 #define NV_LIB_FMOD_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 #define NV_FMOD_DYNAMIC
Index: /trunk/nv/lib/freetype2.hh
===================================================================
--- /trunk/nv/lib/freetype2.hh	(revision 394)
+++ /trunk/nv/lib/freetype2.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_LIB_FREETYPE_HH
@@ -12,5 +12,5 @@
 #include <stddef.h>
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 #define NV_FREETYPE_DYNAMIC
Index: /trunk/nv/lib/gl.hh
===================================================================
--- /trunk/nv/lib/gl.hh	(revision 394)
+++ /trunk/nv/lib/gl.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_LIB_GL_HH
 #define NV_LIB_GL_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 #if NV_PLATFORM == NV_WINDOWS
Index: /trunk/nv/lib/lua.hh
===================================================================
--- /trunk/nv/lib/lua.hh	(revision 394)
+++ /trunk/nv/lib/lua.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_LIB_LUA_HH
@@ -33,5 +33,5 @@
 ******************************************************************************/
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 #define NV_LUA_DYNAMIC
Index: /trunk/nv/lib/sdl.hh
===================================================================
--- /trunk/nv/lib/sdl.hh	(revision 394)
+++ /trunk/nv/lib/sdl.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_LIB_SDL_HH
 #define NV_LIB_SDL_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 #define NV_SDL_DYNAMIC
Index: /trunk/nv/lib/sdl_image.hh
===================================================================
--- /trunk/nv/lib/sdl_image.hh	(revision 394)
+++ /trunk/nv/lib/sdl_image.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_LIB_SDL_IMAGE_HH
 #define NV_LIB_SDL_IMAGE_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/lib/sdl.hh>
 
Index: /trunk/nv/lib/sdl_mixer.hh
===================================================================
--- /trunk/nv/lib/sdl_mixer.hh	(revision 394)
+++ /trunk/nv/lib/sdl_mixer.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_LIB_SDL_MIXER_HH
 #define NV_LIB_SDL_MIXER_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/lib/sdl.hh>
 
Index: /trunk/nv/lua/lua_area.hh
===================================================================
--- /trunk/nv/lua/lua_area.hh	(revision 394)
+++ /trunk/nv/lua/lua_area.hh	(revision 395)
@@ -1,11 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 #ifndef NV_LUA_AREA_HH
 #define NV_LUA_AREA_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/core/position.hh>
 #include <nv/lua/lua_glm.hh>
Index: /trunk/nv/lua/lua_aux.hh
===================================================================
--- /trunk/nv/lua/lua_aux.hh	(revision 394)
+++ /trunk/nv/lua/lua_aux.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 #ifndef NV_LUA_AUX_HH
 #define NV_LUA_AUX_HH
Index: /trunk/nv/lua/lua_dispatch.hh
===================================================================
--- /trunk/nv/lua/lua_dispatch.hh	(revision 394)
+++ /trunk/nv/lua/lua_dispatch.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_LUA_DISPATCH_HH
 #define NV_LUA_DISPATCH_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/string.hh>
 #include <nv/lua/lua_values.hh>
Index: /trunk/nv/lua/lua_flags.hh
===================================================================
--- /trunk/nv/lua/lua_flags.hh	(revision 394)
+++ /trunk/nv/lua/lua_flags.hh	(revision 395)
@@ -1,11 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 #ifndef NV_LUA_FLAGS_HH
 #define NV_LUA_FLAGS_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/flags.hh>
 #include <nv/lua/lua_state.hh>
Index: /trunk/nv/lua/lua_function.hh
===================================================================
--- /trunk/nv/lua/lua_function.hh	(revision 394)
+++ /trunk/nv/lua/lua_function.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_LUA_FUNCTION_HH
 #define NV_LUA_FUNCTION_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/lua/lua_values.hh>
 #include <nv/lua/lua_path.hh>
Index: /trunk/nv/lua/lua_glm.hh
===================================================================
--- /trunk/nv/lua/lua_glm.hh	(revision 394)
+++ /trunk/nv/lua/lua_glm.hh	(revision 395)
@@ -1,11 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 #ifndef NV_LUA_GLM_HH
 #define NV_LUA_GLM_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <nv/lua/lua_values.hh>
Index: /trunk/nv/lua/lua_handle.hh
===================================================================
--- /trunk/nv/lua/lua_handle.hh	(revision 394)
+++ /trunk/nv/lua/lua_handle.hh	(revision 395)
@@ -1,11 +1,12 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 #ifndef NV_LUA_HANDLE_HH
 #define NV_LUA_HANDLE_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/handle.hh>
 #include <nv/lua/lua_values.hh>
Index: /trunk/nv/lua/lua_map_area.hh
===================================================================
--- /trunk/nv/lua/lua_map_area.hh	(revision 394)
+++ /trunk/nv/lua/lua_map_area.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
Index: /trunk/nv/lua/lua_map_tile.hh
===================================================================
--- /trunk/nv/lua/lua_map_tile.hh	(revision 394)
+++ /trunk/nv/lua/lua_map_tile.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -13,5 +13,5 @@
 #define NV_LUA_MAP_TILE_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/lua/lua_state.hh>
 
Index: /trunk/nv/lua/lua_nova.hh
===================================================================
--- /trunk/nv/lua/lua_nova.hh	(revision 394)
+++ /trunk/nv/lua/lua_nova.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 #ifndef NV_LUA_NOVA_HH
 #define NV_LUA_NOVA_HH
Index: /trunk/nv/lua/lua_path.hh
===================================================================
--- /trunk/nv/lua/lua_path.hh	(revision 394)
+++ /trunk/nv/lua/lua_path.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 //
 // TODO : prepare tests:
@@ -14,5 +14,5 @@
 #define NV_LUA_PATH_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/string.hh>
 #include <nv/stl/utility.hh>
Index: /trunk/nv/lua/lua_raw.hh
===================================================================
--- /trunk/nv/lua/lua_raw.hh	(revision 394)
+++ /trunk/nv/lua/lua_raw.hh	(revision 395)
@@ -1,11 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 #ifndef NV_LUA_RAW_HH
 #define NV_LUA_RAW_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/vector.hh>
 #include <nv/lib/lua.hh>
Index: /trunk/nv/lua/lua_state.hh
===================================================================
--- /trunk/nv/lua/lua_state.hh	(revision 394)
+++ /trunk/nv/lua/lua_state.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 //
 // TODO: decouple from the type database
@@ -12,5 +12,5 @@
 #define NV_LUA_STATE_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/flags.hh>
 #include <nv/stl/handle.hh>
Index: /trunk/nv/lua/lua_values.hh
===================================================================
--- /trunk/nv/lua/lua_values.hh	(revision 394)
+++ /trunk/nv/lua/lua_values.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_LUA_VALUES_HH
 #define NV_LUA_VALUES_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/type_traits/properties.hh>
 #include <nv/stl/string.hh>
Index: /trunk/nv/rocket/rocket_interface.hh
===================================================================
--- /trunk/nv/rocket/rocket_interface.hh	(revision 394)
+++ /trunk/nv/rocket/rocket_interface.hh	(revision 395)
@@ -2,16 +2,17 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
-* @file rocket_interface.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief libRocket interface
-*/
+ * @file rocket_interface.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief libRocket interface
+ */
 
 #ifndef NV_ROCKET_INTERFACE_HH
 #define NV_ROCKET_INTERFACE_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/interface/window.hh>
 
Index: /trunk/nv/rogue/fov.hh
===================================================================
--- /trunk/nv/rogue/fov.hh	(revision 394)
+++ /trunk/nv/rogue/fov.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 //
 // TODO : get rid of per-cell virtual calls
@@ -10,5 +10,5 @@
 #define NV_ROGUE_FOV_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/core/position.hh>
 #include <nv/interface/map_area.hh>
Index: /trunk/nv/rogue/fov_recursive_shadowcasting.hh
===================================================================
--- /trunk/nv/rogue/fov_recursive_shadowcasting.hh	(revision 394)
+++ /trunk/nv/rogue/fov_recursive_shadowcasting.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_ROGUE_FOV_RECURSIVE_SHADOWCASTING_HH
 #define NV_ROGUE_FOV_RECURSIVE_SHADOWCASTING_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/core/position.hh>
 #include <nv/rogue/fov.hh>
Index: /trunk/nv/sdl/sdl_audio.hh
===================================================================
--- /trunk/nv/sdl/sdl_audio.hh	(revision 394)
+++ /trunk/nv/sdl/sdl_audio.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file sdl_audio.hh
@@ -13,5 +14,5 @@
 #define NV_SDL_AUDIO_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/interface/audio.hh>
 
Index: /trunk/nv/sdl/sdl_input.hh
===================================================================
--- /trunk/nv/sdl/sdl_input.hh	(revision 394)
+++ /trunk/nv/sdl/sdl_input.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file sdl_input.hh
@@ -13,5 +14,5 @@
 #define NV_SDL_INPUT_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/interface/input.hh>
 
Index: /trunk/nv/sdl/sdl_window.hh
===================================================================
--- /trunk/nv/sdl/sdl_window.hh	(revision 394)
+++ /trunk/nv/sdl/sdl_window.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file sdl_window.hh
Index: /trunk/nv/sdl/sdl_window_manager.hh
===================================================================
--- /trunk/nv/sdl/sdl_window_manager.hh	(revision 394)
+++ /trunk/nv/sdl/sdl_window_manager.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of Nova Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file sdl_window_manager.hh
Index: /trunk/nv/stl/algorithm.hh
===================================================================
--- /trunk/nv/stl/algorithm.hh	(revision 394)
+++ /trunk/nv/stl/algorithm.hh	(revision 395)
@@ -2,12 +2,12 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
-* @file algorithm.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief STL algorithm library
-*/
+ * @file algorithm.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief STL algorithm library
+ */
 
 #ifndef NV_STL_ALGORITHM_HH
Index: /trunk/nv/stl/algorithm/common.hh
===================================================================
--- /trunk/nv/stl/algorithm/common.hh	(revision 394)
+++ /trunk/nv/stl/algorithm/common.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_STL_ALGORITHM_COMMON_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 namespace nv
Index: /trunk/nv/stl/algorithm/copy.hh
===================================================================
--- /trunk/nv/stl/algorithm/copy.hh	(revision 394)
+++ /trunk/nv/stl/algorithm/copy.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
Index: /trunk/nv/stl/algorithm/fill.hh
===================================================================
--- /trunk/nv/stl/algorithm/fill.hh	(revision 394)
+++ /trunk/nv/stl/algorithm/fill.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
Index: /trunk/nv/stl/algorithm/raw.hh
===================================================================
--- /trunk/nv/stl/algorithm/raw.hh	(revision 394)
+++ /trunk/nv/stl/algorithm/raw.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
Index: /trunk/nv/stl/allocator.hh
===================================================================
--- /trunk/nv/stl/allocator.hh	(revision 394)
+++ /trunk/nv/stl/allocator.hh	(revision 395)
@@ -2,22 +2,22 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
-* @file allocator.hh
-* @author Kornel Kisielewicz
-* @brief allocator type
-*
-* Allocator concept based on:
-*
-* http://bitsquid.blogspot.com/2010/09/custom-memory-allocation-in-c.html
-* http://www.gamedev.net/page/resources/_/technical/general-programming/c-custom-memory-allocation-r3010
-*/
+ * @file allocator.hh
+ * @author Kornel Kisielewicz
+ * @brief allocator type
+ *
+ * Allocator concept based on:
+ *
+ * http://bitsquid.blogspot.com/2010/09/custom-memory-allocation-in-c.html
+ * http://www.gamedev.net/page/resources/_/technical/general-programming/c-custom-memory-allocation-r3010
+ */
 
-#ifndef NV_CORE_ALLOCATOR_HH
-#define NV_CORE_ALLOCATOR_HH
+#ifndef NV_STL_ALLOCATOR_HH
+#define NV_STL_ALLOCATOR_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 namespace nv
Index: /trunk/nv/stl/any.hh
===================================================================
--- /trunk/nv/stl/any.hh	(revision 394)
+++ /trunk/nv/stl/any.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -13,8 +13,8 @@
  */
 
-#ifndef NV_CORE_ANY_HH
-#define NV_CORE_ANY_HH
+#ifndef NV_STL_ANY_HH
+#define NV_STL_ANY_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/utility.hh>
 #include <nv/stl/type_traits.hh>
@@ -156,3 +156,3 @@
 }
 
-#endif // NV_CORE_ANY_HH
+#endif // NV_STL_ANY_HH
Index: /trunk/nv/stl/array.hh
===================================================================
--- /trunk/nv/stl/array.hh	(revision 394)
+++ /trunk/nv/stl/array.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,4 @@
 #define NV_STL_ARRAY_HH
 
-#include <nv/core/common.hh>
 #include <nv/stl/container/contiguous_storage.hh>
 #include <nv/stl/container/contiguous_storage_policy.hh>
Index: /trunk/nv/stl/array2d.hh
===================================================================
--- /trunk/nv/stl/array2d.hh	(revision 394)
+++ /trunk/nv/stl/array2d.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -13,8 +13,8 @@
 // TODO: make it work with the stl allocator
 
-#ifndef NV_CORE_ARRAY2D_HH
-#define NV_CORE_ARRAY2D_HH
-
-#include <nv/core/common.hh>
+#ifndef NV_STL_ARRAY2D_HH
+#define NV_STL_ARRAY2D_HH
+
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <nv/stl/range.hh>
@@ -355,3 +355,3 @@
 }
 
-#endif // NV_CORE_ARRAY2D_HH
+#endif // NV_STL_ARRAY2D_HH
Index: /trunk/nv/stl/assert.hh
===================================================================
--- /trunk/nv/stl/assert.hh	(revision 394)
+++ /trunk/nv/stl/assert.hh	(revision 395)
@@ -2,22 +2,22 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
-* @file assert.hh
-* @author Kornel Kisielewicz
-* @brief Assert functions
-*/
+ * @file assert.hh
+ * @author Kornel Kisielewicz
+ * @brief Assert functions
+ */
 
-#ifndef NV_CORE_COMMON_HH
-#error "Do not include assert.hh directly, inlcude nv/core/common.hh"
+#ifndef NV_BASE_COMMON_HH
+#error "Do not include assert.hh directly, inlcude nv/common.hh"
 #endif
 
-#ifndef NV_STL_ASSERT_HH
-#define NV_STL_ASSERT_HH
+#ifndef NV_BASE_ASSERT_HH
+#define NV_BASE_ASSERT_HH
 
 #ifdef NV_INTERNAL_INCLUDE
-#undef NV_CORE_COMMON_HH
+#undef NV_BASE_COMMON_HH
 #include <nv/core/common.hh>
 #endif
@@ -45,3 +45,3 @@
 #endif 
 
-#endif // NV_STL_ASSERT_HH
+#endif // NV_BASE_ASSERT_HH
Index: /trunk/nv/stl/capi.hh
===================================================================
--- /trunk/nv/stl/capi.hh	(revision 394)
+++ /trunk/nv/stl/capi.hh	(revision 395)
@@ -2,19 +2,19 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
-* @file capi.hh
-* @author Kornel Kisielewicz
-* @brief C API functions
-*
-* This header is temporary
-*/
+ * @file capi.hh
+ * @author Kornel Kisielewicz
+ * @brief C API functions
+ *
+ * This header is temporary
+ */
 
-#ifndef NV_STL_CAPI_HH
-#define NV_STL_CAPI_HH
+#ifndef NV_BASE_CAPI_HH
+#define NV_BASE_CAPI_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 namespace nv
@@ -120,3 +120,3 @@
 #undef NV_CAPI_CALL
 
-#endif // NV_STL_CAPI_HH
+#endif // NV_BASE_CAPI_HH
Index: /trunk/nv/stl/container/contiguous_storage.hh
===================================================================
--- /trunk/nv/stl/container/contiguous_storage.hh	(revision 394)
+++ /trunk/nv/stl/container/contiguous_storage.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_STL_CONTAINER_CONTIGUOUS_STORAGE_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/type_traits/alignment.hh>
 #include <nv/stl/capi.hh>
Index: /trunk/nv/stl/container/contiguous_storage_policy.hh
===================================================================
--- /trunk/nv/stl/container/contiguous_storage_policy.hh	(revision 394)
+++ /trunk/nv/stl/container/contiguous_storage_policy.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_STL_CONTAINER_CONTIGUOUS_STORAGE_POLICY
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/memory.hh>
 #include <nv/stl/container/contiguous_storage.hh>
Index: /trunk/nv/stl/container/fixed_container_handler.hh
===================================================================
--- /trunk/nv/stl/container/fixed_container_handler.hh	(revision 394)
+++ /trunk/nv/stl/container/fixed_container_handler.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_STL_CONTAINER_FIXED_CONTAINER_HANDLER_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/container/initialize_policy.hh>
 
Index: /trunk/nv/stl/container/growing_container_handler.hh
===================================================================
--- /trunk/nv/stl/container/growing_container_handler.hh	(revision 394)
+++ /trunk/nv/stl/container/growing_container_handler.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_STL_CONTAINER_GROWING_CONTAINER_HANDLER_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/container/initialize_policy.hh>
 #include <nv/stl/container/sized_container_handler.hh>
Index: /trunk/nv/stl/container/hash_table.hh
===================================================================
--- /trunk/nv/stl/container/hash_table.hh	(revision 394)
+++ /trunk/nv/stl/container/hash_table.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_STL_HASH_TABLE_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/memory.hh>
 #include <nv/stl/functional/hash.hh>
Index: /trunk/nv/stl/container/hash_table_policy.hh
===================================================================
--- /trunk/nv/stl/container/hash_table_policy.hh	(revision 394)
+++ /trunk/nv/stl/container/hash_table_policy.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_STL_HASH_TABLE_POLICY_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/functional/hash.hh>
 #include <nv/stl/functional/comparisons.hh>
Index: /trunk/nv/stl/container/initialize_policy.hh
===================================================================
--- /trunk/nv/stl/container/initialize_policy.hh	(revision 394)
+++ /trunk/nv/stl/container/initialize_policy.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_STL_INITIALIZE_POLICY_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/memory.hh>
 
Index: /trunk/nv/stl/container/sized_container_handler.hh
===================================================================
--- /trunk/nv/stl/container/sized_container_handler.hh	(revision 394)
+++ /trunk/nv/stl/container/sized_container_handler.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_STL_CONTAINER_SIZED_CONTAINER_HANDLER_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/container/initialize_policy.hh>
 
Index: /trunk/nv/stl/cstring_store.hh
===================================================================
--- /trunk/nv/stl/cstring_store.hh	(revision 394)
+++ /trunk/nv/stl/cstring_store.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -11,8 +11,8 @@
 */
 
-#ifndef NV_CORE_CSTRING_STORE_HH
-#define NV_CORE_CSTRING_STORE_HH
+#ifndef NV_STL_CSTRING_STORE_HH
+#define NV_STL_CSTRING_STORE_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/unordered_map.hh>
 #include <nv/stl/array.hh>
@@ -118,3 +118,3 @@
 }
 
-#endif // NV_CORE_STRING_STORE_HH
+#endif // NV_STL_STRING_STORE_HH
Index: /trunk/nv/stl/exception.hh
===================================================================
--- /trunk/nv/stl/exception.hh	(revision 394)
+++ /trunk/nv/stl/exception.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -11,8 +11,8 @@
  */
 
-#ifndef NV_CORE_EXCEPTION_HH
-#define NV_CORE_EXCEPTION_HH
+#ifndef NV_STL_EXCEPTION_HH
+#define NV_STL_EXCEPTION_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <string>
 #include <exception>
@@ -44,3 +44,3 @@
 }
 
-#endif // NV_CORE_EXCEPTION_HH
+#endif // NV_STL_EXCEPTION_HH
Index: /trunk/nv/stl/flags.hh
===================================================================
--- /trunk/nv/stl/flags.hh	(revision 394)
+++ /trunk/nv/stl/flags.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -11,8 +11,8 @@
  */
 
-#ifndef NV_CORE_FLAGS_HH
-#define NV_CORE_FLAGS_HH
-
-#include <nv/core/common.hh>
+#ifndef NV_STL_FLAGS_HH
+#define NV_STL_FLAGS_HH
+
+#include <nv/common.hh>
 #include <nv/stl/type_traits/transforms.hh>
 #include <nv/stl/algorithm.hh>
@@ -219,3 +219,3 @@
 } // namespace nv
 
-#endif // NV_CORE_FLAGS_HH
+#endif // NV_STL_FLAGS_HH
Index: /trunk/nv/stl/functional.hh
===================================================================
--- /trunk/nv/stl/functional.hh	(revision 394)
+++ /trunk/nv/stl/functional.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 /**
  * @file functional.hh
@@ -9,5 +9,4 @@
  * @brief functional
  */
-// TODO : implement
 
 #ifndef NV_STL_FUNCTIONAL_HH
@@ -22,3 +21,3 @@
 #include <nv/stl/functional/comparisons.hh>
 
-#endif // NV_STL_TYPE_TRAITS_HH
+#endif // NV_STL_FUNCTIONAL_HH
Index: /trunk/nv/stl/functional/arithmetic_ops.hh
===================================================================
--- /trunk/nv/stl/functional/arithmetic_ops.hh	(revision 394)
+++ /trunk/nv/stl/functional/arithmetic_ops.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
Index: /trunk/nv/stl/functional/bitwise_ops.hh
===================================================================
--- /trunk/nv/stl/functional/bitwise_ops.hh	(revision 394)
+++ /trunk/nv/stl/functional/bitwise_ops.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
Index: /trunk/nv/stl/functional/common.hh
===================================================================
--- /trunk/nv/stl/functional/common.hh	(revision 394)
+++ /trunk/nv/stl/functional/common.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_STL_FUNCTIONAL_COMMON_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 namespace nv
Index: /trunk/nv/stl/functional/comparisons.hh
===================================================================
--- /trunk/nv/stl/functional/comparisons.hh	(revision 394)
+++ /trunk/nv/stl/functional/comparisons.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
Index: /trunk/nv/stl/functional/hash.hh
===================================================================
--- /trunk/nv/stl/functional/hash.hh	(revision 394)
+++ /trunk/nv/stl/functional/hash.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
Index: /trunk/nv/stl/functional/invoke.hh
===================================================================
--- /trunk/nv/stl/functional/invoke.hh	(revision 394)
+++ /trunk/nv/stl/functional/invoke.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
Index: /trunk/nv/stl/functional/logical_ops.hh
===================================================================
--- /trunk/nv/stl/functional/logical_ops.hh	(revision 394)
+++ /trunk/nv/stl/functional/logical_ops.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
Index: /trunk/nv/stl/functional/mem_fn.hh
===================================================================
--- /trunk/nv/stl/functional/mem_fn.hh	(revision 394)
+++ /trunk/nv/stl/functional/mem_fn.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
Index: /trunk/nv/stl/functional/reference.hh
===================================================================
--- /trunk/nv/stl/functional/reference.hh	(revision 394)
+++ /trunk/nv/stl/functional/reference.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
Index: /trunk/nv/stl/handle.hh
===================================================================
--- /trunk/nv/stl/handle.hh	(revision 394)
+++ /trunk/nv/stl/handle.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -10,8 +10,8 @@
  */
 
-#ifndef NV_CORE_HANDLE_HH
-#define NV_CORE_HANDLE_HH
-
-#include <nv/core/common.hh>
+#ifndef NV_STL_HANDLE_HH
+#define NV_STL_HANDLE_HH
+
+#include <nv/common.hh>
 #include <nv/stl/vector.hh>
 
@@ -316,3 +316,3 @@
 }
 
-#endif // NV_CORE_HANDLE_HH
+#endif // NV_STL_HANDLE_HH
Index: /trunk/nv/stl/iterator.hh
===================================================================
--- /trunk/nv/stl/iterator.hh	(revision 394)
+++ /trunk/nv/stl/iterator.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,5 +14,5 @@
 #define NV_STL_ITERATOR_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 namespace nv
Index: /trunk/nv/stl/limits.hh
===================================================================
--- /trunk/nv/stl/limits.hh	(revision 394)
+++ /trunk/nv/stl/limits.hh	(revision 395)
@@ -2,17 +2,17 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
-* @file limits.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief STL limits library
-*/
+ * @file limits.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief STL limits library
+ */
 
 #ifndef NV_STL_LIMITS_HH
 #define NV_STL_LIMITS_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 #if NV_COMPILER == NV_MSVC
Index: /trunk/nv/stl/math.hh
===================================================================
--- /trunk/nv/stl/math.hh	(revision 394)
+++ /trunk/nv/stl/math.hh	(revision 395)
@@ -1,12 +1,12 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
-
-#ifndef NV_CORE_MATH_HH
-#define NV_CORE_MATH_HH
-
-#include <nv/core/common.hh>
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
+#ifndef NV_STL_MATH_HH
+#define NV_STL_MATH_HH
+
+#include <nv/common.hh>
 
 #if NV_COMPILER == NV_GNUC
@@ -268,3 +268,3 @@
 } // namespace nv
 
-#endif // NV_CORE_MATH_HH
+#endif // NV_STL_MATH_HH
Index: /trunk/nv/stl/memory.hh
===================================================================
--- /trunk/nv/stl/memory.hh	(revision 394)
+++ /trunk/nv/stl/memory.hh	(revision 395)
@@ -2,19 +2,20 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
-* @file memory.hh
-* @author Kornel Kisielewicz
-* @brief memory utilities
-*/
+ * @file memory.hh
+ * @author Kornel Kisielewicz
+ * @brief memory utilities
+ */
 
 // TODO: implement const and mutable buffer using the union trick
 
-#ifndef NV_CORE_MEMORY_HH
-#define NV_CORE_MEMORY_HH
-
-#include <nv/core/common.hh>
+#ifndef NV_STL_MEMORY_HH
+#define NV_STL_MEMORY_HH
+
+#include <nv/common.hh>
+#include <nv/stl/new.hh>
 #include <nv/stl/type_traits/properties.hh>
 #include <nv/stl/type_traits/alignment.hh>
@@ -22,10 +23,8 @@
 #include <nv/stl/iterator.hh>
 #include <nv/stl/capi.hh>
-#include <new>
 
 namespace nv
 {
-
-
+	
 	namespace mem_flags
 	{
@@ -485,3 +484,3 @@
 }
 
-#endif // NV_CORE_MEMORY_HH
+#endif // NV_STL_MEMORY_HH
Index: /trunk/nv/stl/numeric.hh
===================================================================
--- /trunk/nv/stl/numeric.hh	(revision 394)
+++ /trunk/nv/stl/numeric.hh	(revision 395)
@@ -2,17 +2,17 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
-* @file numeric.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief STL numeric library
-*/
+ * @file numeric.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief STL numeric library
+ */
 
 #ifndef NV_STL_NUMERIC_HH
 #define NV_STL_NUMERIC_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 namespace nv
Index: /trunk/nv/stl/range.hh
===================================================================
--- /trunk/nv/stl/range.hh	(revision 394)
+++ /trunk/nv/stl/range.hh	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file range.hh
@@ -10,8 +11,8 @@
  */
 
-#ifndef NV_CORE_RANGE_HH
-#define NV_CORE_RANGE_HH
-
-#include <nv/core/common.hh>
+#ifndef NV_STL_RANGE_HH
+#define NV_STL_RANGE_HH
+
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <nv/stl/iterator.hh>
@@ -231,3 +232,3 @@
 }
 
-#endif // NV_CORE_RANGE_HH
+#endif // NV_STL_RANGE_HH
Index: /trunk/nv/stl/rtti_support.hh
===================================================================
--- /trunk/nv/stl/rtti_support.hh	(revision 394)
+++ /trunk/nv/stl/rtti_support.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -14,6 +14,6 @@
  */
 
-#ifndef NV_STL_RTTI_SUPPORT_HH
-#define NV_STL_RTTI_SUPPORT_HH
+#ifndef NV_BASE_RTTI_SUPPORT_HH
+#define NV_BASE_RTTI_SUPPORT_HH
 
 #define NV_RTTI_DECLARE(T) \
@@ -78,3 +78,3 @@
 }
 
-#endif // NV_STL_RTTI_SUPPORT_HH
+#endif // NV_BASE_RTTI_SUPPORT_HH
Index: /trunk/nv/stl/rtti_types.hh
===================================================================
--- /trunk/nv/stl/rtti_types.hh	(revision 394)
+++ /trunk/nv/stl/rtti_types.hh	(revision 395)
@@ -2,17 +2,17 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
-* @file rtti_types.hh
-* @author Kornel Kisielewicz
-* @brief RTTI emulation - basic types
-*/
+ * @file rtti_types.hh
+ * @author Kornel Kisielewicz
+ * @brief RTTI emulation - basic types
+ */
 
 #ifndef NV_STL_RTTI_TYPES_HH
 #define NV_STL_RTTI_TYPES_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/math.hh>
 #include <nv/stl/rtti_support.hh>
Index: /trunk/nv/stl/singleton.hh
===================================================================
--- /trunk/nv/stl/singleton.hh	(revision 394)
+++ /trunk/nv/stl/singleton.hh	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
@@ -11,8 +11,8 @@
  */
 
-#ifndef NV_CORE_SINGLETON_HH
-#define NV_CORE_SINGLETON_HH
+#ifndef NV_STL_SINGLETON_HH
+#define NV_STL_SINGLETON_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 namespace nv
@@ -118,3 +118,3 @@
 } // namespace nv
 
-#endif // NV_CORE_SINGLETON_HH
+#endif // NV_STL_SINGLETON_HH
Index: /trunk/nv/stl/string.hh
===================================================================
--- /trunk/nv/stl/string.hh	(revision 394)
+++ /trunk/nv/stl/string.hh	(revision 395)
@@ -1,5 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// Copyright (C) 2012-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 //
 // TODO: 
@@ -18,10 +20,10 @@
 // TODO: remove templating on char type, make a string_utf8 instead.
 
-#ifndef NV_CORE_STRING_HH
-#define NV_CORE_STRING_HH
-
+#ifndef NV_STL_STRING_HH
+#define NV_STL_STRING_HH
+
+#include <nv/common.hh>
 #include <string>
 #include <sstream>
-#include <nv/core/common.hh>
 #include <nv/stl/type_traits/primary.hh>
 #include <nv/stl/memory.hh>
@@ -476,3 +478,3 @@
 }
 
-#endif // NV_CORE_STRING_HH
+#endif // NV_STL_STRING_HH
Index: /trunk/nv/stl/type_traits.hh
===================================================================
--- /trunk/nv/stl/type_traits.hh	(revision 394)
+++ /trunk/nv/stl/type_traits.hh	(revision 395)
@@ -2,6 +2,7 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
  * @file type_traits.hh
@@ -9,5 +10,6 @@
  * @brief type traits
  */
-// TODO : "......" function match version?
+
+ // TODO : "......" function match version?
 // TODO : the following symbols are unimplemented:
 //  * is_constructible, is_trivially_constructible, is_nothrow_constructible
@@ -23,5 +25,4 @@
 #define NV_STL_TYPE_TRAITS_HH
 
-#include <nv/core/common.hh>
 #include <nv/stl/type_traits/common.hh>
 #include <nv/stl/type_traits/primary.hh>
Index: /trunk/nv/stl/type_traits/alignment.hh
===================================================================
--- /trunk/nv/stl/type_traits/alignment.hh	(revision 394)
+++ /trunk/nv/stl/type_traits/alignment.hh	(revision 395)
@@ -2,16 +2,16 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
-* @file alignment.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief type traits - alignment
-*/
+ * @file alignment.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief type traits - alignment
+ */
 
 #ifndef NV_STL_TRAITS_ALIGNMENT_HH
 #define NV_STL_TRAITS_ALIGNMENT_HH
 
-#include <nv/core/common.hh>
 #include <nv/stl/type_traits/common.hh>
 
Index: /trunk/nv/stl/type_traits/common.hh
===================================================================
--- /trunk/nv/stl/type_traits/common.hh	(revision 394)
+++ /trunk/nv/stl/type_traits/common.hh	(revision 395)
@@ -2,16 +2,17 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
-* @file common.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief type traits - common traits used everywhere
-*/
+ * @file common.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief type traits - common traits used everywhere
+ */
 
 #ifndef NV_STL_TRAITS_COMMON_HH
 #define NV_STL_TRAITS_COMMON_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 
 namespace nv
Index: /trunk/nv/stl/type_traits/experimental.hh
===================================================================
--- /trunk/nv/stl/type_traits/experimental.hh	(revision 394)
+++ /trunk/nv/stl/type_traits/experimental.hh	(revision 395)
@@ -2,19 +2,19 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
-* @file alignment.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief type traits - experimental
-* 
-* based on http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4502.pdf
-* and http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n3911.pdf
-*/
+ * @file experimental.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief type traits - experimental
+ * 
+ * based on http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4502.pdf
+ * and http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n3911.pdf
+ */
 
 #ifndef NV_STL_TYPE_TRAITS_EXPERIMENTAL_HH
 #define NV_STL_TYPE_TRAITS_EXPERIMENTAL_HH
 
-#include <nv/core/common.hh>
 #include <nv/stl/type_traits/common.hh>
 
Index: /trunk/nv/stl/type_traits/function.hh
===================================================================
--- /trunk/nv/stl/type_traits/function.hh	(revision 394)
+++ /trunk/nv/stl/type_traits/function.hh	(revision 395)
@@ -2,11 +2,12 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
-* @file function.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief type traits - function traits
-*/
+ * @file function.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief type traits - function traits
+ */
 // TODO: remove_cv? call traits? support "......"?
 
@@ -14,5 +15,4 @@
 #define NV_STL_TRAITS_FUNCTION_HH
 
-#include <nv/core/common.hh>
 #include <nv/stl/type_traits/common.hh>
 
Index: /trunk/nv/stl/type_traits/primary.hh
===================================================================
--- /trunk/nv/stl/type_traits/primary.hh	(revision 394)
+++ /trunk/nv/stl/type_traits/primary.hh	(revision 395)
@@ -2,16 +2,16 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
-* @file primary.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief type traits - primary traits
-*/
+ * @file primary.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief type traits - primary traits
+ */
 
 #ifndef NV_STL_TRAITS_PRIMARY_HH
 #define NV_STL_TRAITS_PRIMARY_HH
 
-#include <nv/core/common.hh>
 #include <nv/stl/type_traits/common.hh>
 
Index: /trunk/nv/stl/type_traits/properties.hh
===================================================================
--- /trunk/nv/stl/type_traits/properties.hh	(revision 394)
+++ /trunk/nv/stl/type_traits/properties.hh	(revision 395)
@@ -2,16 +2,16 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
-* @file properties.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief type traits - type properties
-*/
+ * @file properties.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief type traits - type properties
+ */
 
 #ifndef NV_STL_TRAITS_PROPERTIES_HH
 #define NV_STL_TRAITS_PROPERTIES_HH
 
-#include <nv/core/common.hh>
 #include <nv/stl/type_traits/common.hh>
 #include <nv/stl/type_traits/primary.hh>
Index: /trunk/nv/stl/type_traits/transforms.hh
===================================================================
--- /trunk/nv/stl/type_traits/transforms.hh	(revision 394)
+++ /trunk/nv/stl/type_traits/transforms.hh	(revision 395)
@@ -2,19 +2,19 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 /**
-* @file transforms.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief type traits - transforms
-*/
+ * @file transforms.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief type traits - transforms
+ */
 
 #ifndef NV_STL_TRAITS_TRANSFORMS_HH
 #define NV_STL_TRAITS_TRANSFORMS_HH
 
-#include <nv/core/common.hh>
-#include <nv/stl/functional/invoke.hh>
 #include <nv/stl/type_traits/common.hh>
 #include <nv/stl/type_traits/primary.hh>
+#include <nv/stl/functional/invoke.hh>
 
 namespace nv
Index: /trunk/nv/stl/unordered_map.hh
===================================================================
--- /trunk/nv/stl/unordered_map.hh	(revision 394)
+++ /trunk/nv/stl/unordered_map.hh	(revision 395)
@@ -2,17 +2,17 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
-* @file unordered_map.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief unordered_map
-*/
+ * @file unordered_map.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief unordered_map
+ */
 
 #ifndef NV_STL_UNORDERED_MAP_HH
 #define NV_STL_UNORDERED_MAP_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/container/hash_table.hh>
 #include <nv/stl/utility/pair.hh>
Index: /trunk/nv/stl/utility.hh
===================================================================
--- /trunk/nv/stl/utility.hh	(revision 394)
+++ /trunk/nv/stl/utility.hh	(revision 395)
@@ -2,12 +2,12 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
-* @file utility.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief STL utility library
-*/
+ * @file utility.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief STL utility library
+ */
 
 #ifndef NV_STL_UTILITY_HH
Index: /trunk/nv/stl/utility/common.hh
===================================================================
--- /trunk/nv/stl/utility/common.hh	(revision 394)
+++ /trunk/nv/stl/utility/common.hh	(revision 395)
@@ -1,19 +1,18 @@
-#pragma once
 // Copyright (C) 2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
-* @file common.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief STL common utility library
-*/
+ * @file common.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief STL common utility library
+ */
 
 #ifndef NV_STL_UTILITY_COMMON_HH
 #define NV_STL_UTILITY_COMMON_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/type_traits/common.hh>
 
Index: /trunk/nv/stl/utility/make_pair.hh
===================================================================
--- /trunk/nv/stl/utility/make_pair.hh	(revision 394)
+++ /trunk/nv/stl/utility/make_pair.hh	(revision 395)
@@ -2,12 +2,12 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
-* @file make_pair.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief STL make_pair library
-*/
+ * @file make_pair.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief STL make_pair library
+ */
 
 #ifndef NV_STL_UTILITY_MAKE_PAIR_HH
Index: /trunk/nv/stl/utility/pair.hh
===================================================================
--- /trunk/nv/stl/utility/pair.hh	(revision 394)
+++ /trunk/nv/stl/utility/pair.hh	(revision 395)
@@ -2,12 +2,12 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
-* @file pair.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief STL pair library
-*/
+ * @file pair.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief STL pair library
+ */
 
 #ifndef NV_STL_UTILITY_PAIR_HH
Index: /trunk/nv/stl/vector.hh
===================================================================
--- /trunk/nv/stl/vector.hh	(revision 394)
+++ /trunk/nv/stl/vector.hh	(revision 395)
@@ -1,18 +1,18 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 /**
-* @file vector.hh
-* @author Kornel Kisielewicz epyon@chaosforge.org
-* @brief exception free vector class
-*/
+ * @file vector.hh
+ * @author Kornel Kisielewicz epyon@chaosforge.org
+ * @brief exception free vector class
+ */
 
 #ifndef NV_STL_VECTOR_HH
 #define NV_STL_VECTOR_HH
 
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/stl/container/contiguous_storage.hh>
 #include <nv/stl/container/contiguous_storage_policy.hh>
@@ -36,3 +36,3 @@
 }
 
-#endif // NV_CORE_VECTOR_HH
+#endif // NV_STL_VECTOR_HH
Index: /trunk/nv/wx/wx.hh
===================================================================
--- /trunk/nv/wx/wx.hh	(revision 394)
+++ /trunk/nv/wx/wx.hh	(revision 395)
@@ -2,6 +2,7 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 #ifndef NV_WX_HH
 #define NV_WX_HH
@@ -17,5 +18,5 @@
 #undef near
 #undef far
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/lib/gl.hh>
 #endif NV_WX_HH
Index: /trunk/nv/wx/wx_canvas.hh
===================================================================
--- /trunk/nv/wx/wx_canvas.hh	(revision 394)
+++ /trunk/nv/wx/wx_canvas.hh	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #ifndef NV_WX_CANVAS_HH
@@ -9,5 +9,5 @@
 
 #include <nv/wx/wx.hh>
-#include <nv/core/common.hh>
+#include <nv/common.hh>
 #include <nv/core/logger.hh>
 #include <nv/lib/gl.hh>
Index: /trunk/src/core/io_event.cc
===================================================================
--- /trunk/src/core/io_event.cc	(revision 394)
+++ /trunk/src/core/io_event.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/core/io_event.hh"
Index: /trunk/src/core/library.cc
===================================================================
--- /trunk/src/core/library.cc	(revision 394)
+++ /trunk/src/core/library.cc	(revision 395)
@@ -1,6 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
-#include "nv/core/common.hh"
+// Copyright (C) 2012-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 #include "nv/core/library.hh"
 
Index: /trunk/src/core/logger.cc
===================================================================
--- /trunk/src/core/logger.cc	(revision 394)
+++ /trunk/src/core/logger.cc	(revision 395)
@@ -1,9 +1,10 @@
-// Copyright (C) 2011-2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// Copyright (C) 2011-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/core/logger.hh"
 
-#include "nv/core/common.hh"
 #include "nv/core/time.hh"
 #include <cstdio>
Index: /trunk/src/core/profiler.cc
===================================================================
--- /trunk/src/core/profiler.cc	(revision 394)
+++ /trunk/src/core/profiler.cc	(revision 395)
@@ -1,5 +1,7 @@
 // Copyright (C) 2012-2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/core/profiler.hh"
Index: /trunk/src/core/random.cc
===================================================================
--- /trunk/src/core/random.cc	(revision 394)
+++ /trunk/src/core/random.cc	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/core/random.hh"
Index: /trunk/src/core/time.cc
===================================================================
--- /trunk/src/core/time.cc	(revision 394)
+++ /trunk/src/core/time.cc	(revision 395)
@@ -1,5 +1,7 @@
 // Copyright (C) 2011-2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/core/time.hh"
Index: /trunk/src/core/uid.cc
===================================================================
--- /trunk/src/core/uid.cc	(revision 394)
+++ /trunk/src/core/uid.cc	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/core/uid.hh"
Index: /trunk/src/curses/curses_terminal.cc
===================================================================
--- /trunk/src/curses/curses_terminal.cc	(revision 394)
+++ /trunk/src/curses/curses_terminal.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2013-2014 ChaosForge Ltd
+// Copyright (C) 2013-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/curses/curses_terminal.hh"
Index: /trunk/src/engine/particle_engine.cc
===================================================================
--- /trunk/src/engine/particle_engine.cc	(revision 394)
+++ /trunk/src/engine/particle_engine.cc	(revision 395)
@@ -1,5 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// Copyright (C) 2014-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/engine/particle_engine.hh"
Index: /trunk/src/engine/program_manager.cc
===================================================================
--- /trunk/src/engine/program_manager.cc	(revision 394)
+++ /trunk/src/engine/program_manager.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/engine/program_manager.hh"
Index: /trunk/src/engine/resource_system.cc
===================================================================
--- /trunk/src/engine/resource_system.cc	(revision 394)
+++ /trunk/src/engine/resource_system.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/engine/resource_system.hh"
Index: /trunk/src/fmod/fmod_audio.cc
===================================================================
--- /trunk/src/fmod/fmod_audio.cc	(revision 394)
+++ /trunk/src/fmod/fmod_audio.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/fmod/fmod_audio.hh"
Index: /trunk/src/formats/assimp_loader.cc
===================================================================
--- /trunk/src/formats/assimp_loader.cc	(revision 394)
+++ /trunk/src/formats/assimp_loader.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/formats/assimp_loader.hh"
Index: /trunk/src/formats/md2_loader.cc
===================================================================
--- /trunk/src/formats/md2_loader.cc	(revision 394)
+++ /trunk/src/formats/md2_loader.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/formats/md2_loader.hh"
Index: /trunk/src/formats/md3_loader.cc
===================================================================
--- /trunk/src/formats/md3_loader.cc	(revision 394)
+++ /trunk/src/formats/md3_loader.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/formats/md3_loader.hh"
Index: /trunk/src/formats/md5_loader.cc
===================================================================
--- /trunk/src/formats/md5_loader.cc	(revision 394)
+++ /trunk/src/formats/md5_loader.cc	(revision 395)
@@ -1,5 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// Copyright (C) 2012-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/formats/md5_loader.hh"
Index: /trunk/src/formats/nmd_loader.cc
===================================================================
--- /trunk/src/formats/nmd_loader.cc	(revision 394)
+++ /trunk/src/formats/nmd_loader.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/formats/nmd_loader.hh"
Index: /trunk/src/formats/obj_loader.cc
===================================================================
--- /trunk/src/formats/obj_loader.cc	(revision 394)
+++ /trunk/src/formats/obj_loader.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/formats/obj_loader.hh"
Index: /trunk/src/gfx/debug_draw.cc
===================================================================
--- /trunk/src/gfx/debug_draw.cc	(revision 394)
+++ /trunk/src/gfx/debug_draw.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/gfx/debug_draw.hh"
Index: /trunk/src/gfx/image.cc
===================================================================
--- /trunk/src/gfx/image.cc	(revision 394)
+++ /trunk/src/gfx/image.cc	(revision 395)
@@ -1,5 +1,7 @@
-// Copyright (C) 2011-2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// Copyright (C) 2011-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/gfx/image.hh"
Index: /trunk/src/gfx/keyframed_mesh.cc
===================================================================
--- /trunk/src/gfx/keyframed_mesh.cc	(revision 394)
+++ /trunk/src/gfx/keyframed_mesh.cc	(revision 395)
@@ -1,5 +1,7 @@
-// Copyright (C) 2011-2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// Copyright (C) 2011-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/gfx/keyframed_mesh.hh"
Index: /trunk/src/gfx/mesh_creator.cc
===================================================================
--- /trunk/src/gfx/mesh_creator.cc	(revision 394)
+++ /trunk/src/gfx/mesh_creator.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/gfx/mesh_creator.hh"
Index: /trunk/src/gfx/skeletal_mesh.cc
===================================================================
--- /trunk/src/gfx/skeletal_mesh.cc	(revision 394)
+++ /trunk/src/gfx/skeletal_mesh.cc	(revision 395)
@@ -1,5 +1,7 @@
-// Copyright (C) 2011-2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// Copyright (C) 2011-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/gfx/skeletal_mesh.hh"
Index: /trunk/src/gfx/texture_atlas.cc
===================================================================
--- /trunk/src/gfx/texture_atlas.cc	(revision 394)
+++ /trunk/src/gfx/texture_atlas.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/gfx/texture_atlas.hh"
Index: /trunk/src/gfx/texture_font.cc
===================================================================
--- /trunk/src/gfx/texture_font.cc	(revision 394)
+++ /trunk/src/gfx/texture_font.cc	(revision 395)
@@ -1,7 +1,8 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 #include "nv/gfx/texture_font.hh"
 
Index: /trunk/src/gl/gl_context.cc
===================================================================
--- /trunk/src/gl/gl_context.cc	(revision 394)
+++ /trunk/src/gl/gl_context.cc	(revision 395)
@@ -1,5 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// Copyright (C) 2012-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/gl/gl_context.hh"
Index: /trunk/src/gl/gl_device.cc
===================================================================
--- /trunk/src/gl/gl_device.cc	(revision 394)
+++ /trunk/src/gl/gl_device.cc	(revision 395)
@@ -1,5 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// Copyright (C) 2012-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/gl/gl_device.hh"
Index: /trunk/src/gl/gl_enum.cc
===================================================================
--- /trunk/src/gl/gl_enum.cc	(revision 394)
+++ /trunk/src/gl/gl_enum.cc	(revision 395)
@@ -1,5 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// Copyright (C) 2012-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/gl/gl_enum.hh"
Index: /trunk/src/gl/gl_window.cc
===================================================================
--- /trunk/src/gl/gl_window.cc	(revision 394)
+++ /trunk/src/gl/gl_window.cc	(revision 395)
@@ -1,5 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// Copyright (C) 2012-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/gl/gl_window.hh"
Index: /trunk/src/gui/gui_ascii_renderer.cc
===================================================================
--- /trunk/src/gui/gui_ascii_renderer.cc	(revision 394)
+++ /trunk/src/gui/gui_ascii_renderer.cc	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/gui/gui_ascii_renderer.hh"
Index: /trunk/src/gui/gui_environment.cc
===================================================================
--- /trunk/src/gui/gui_environment.cc	(revision 394)
+++ /trunk/src/gui/gui_environment.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/gui/gui_environment.hh"
Index: /trunk/src/gui/gui_gfx_renderer.cc
===================================================================
--- /trunk/src/gui/gui_gfx_renderer.cc	(revision 394)
+++ /trunk/src/gui/gui_gfx_renderer.cc	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/gui/gui_gfx_renderer.hh"
Index: /trunk/src/gui/gui_renderer.cc
===================================================================
--- /trunk/src/gui/gui_renderer.cc	(revision 394)
+++ /trunk/src/gui/gui_renderer.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/gui/gui_renderer.hh"
Index: /trunk/src/gui/gui_style.cc
===================================================================
--- /trunk/src/gui/gui_style.cc	(revision 394)
+++ /trunk/src/gui/gui_style.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/gui/gui_style.hh"
Index: /trunk/src/io/c_file_system.cc
===================================================================
--- /trunk/src/io/c_file_system.cc	(revision 394)
+++ /trunk/src/io/c_file_system.cc	(revision 395)
@@ -1,9 +1,11 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// Copyright (C) 2012-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
-#include <cstdio>
 #include "nv/io/c_file_system.hh"
 #include "nv/io/c_stream.hh"
+#include <cstdio>
 
 using namespace nv;
Index: /trunk/src/io/c_stream.cc
===================================================================
--- /trunk/src/io/c_stream.cc	(revision 394)
+++ /trunk/src/io/c_stream.cc	(revision 395)
@@ -1,5 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// Copyright (C) 2012-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/io/c_stream.hh"
Index: /trunk/src/io/std_stream.cc
===================================================================
--- /trunk/src/io/std_stream.cc	(revision 394)
+++ /trunk/src/io/std_stream.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 //
 // TODO: support for write operations, see http://www.mr-edd.co.uk/blog/beginners_guide_streambuf
Index: /trunk/src/io/string_table.cc
===================================================================
--- /trunk/src/io/string_table.cc	(revision 394)
+++ /trunk/src/io/string_table.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/io/string_table.hh"
Index: /trunk/src/lib/assimp.cc
===================================================================
--- /trunk/src/lib/assimp.cc	(revision 394)
+++ /trunk/src/lib/assimp.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd 
+// Copyright (C) 2014-2015 ChaosForge Ltd 
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lib/assimp.hh"
Index: /trunk/src/lib/curses.cc
===================================================================
--- /trunk/src/lib/curses.cc	(revision 394)
+++ /trunk/src/lib/curses.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2013-2014 ChaosForge Ltd
+// Copyright (C) 2013-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lib/curses.hh"
Index: /trunk/src/lib/fmod.cc
===================================================================
--- /trunk/src/lib/fmod.cc	(revision 394)
+++ /trunk/src/lib/fmod.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lib/fmod.hh"
Index: /trunk/src/lib/freetype2.cc
===================================================================
--- /trunk/src/lib/freetype2.cc	(revision 394)
+++ /trunk/src/lib/freetype2.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lib/freetype2.hh"
Index: /trunk/src/lib/gl.cc
===================================================================
--- /trunk/src/lib/gl.cc	(revision 394)
+++ /trunk/src/lib/gl.cc	(revision 395)
@@ -1,9 +1,9 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
-
-#include "nv/core/common.hh"
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
+#include "nv/common.hh"
 #include "nv/stl/range.hh"
 #include "nv/core/logging.hh"
Index: /trunk/src/lib/lua.cc
===================================================================
--- /trunk/src/lib/lua.cc	(revision 394)
+++ /trunk/src/lib/lua.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lib/lua.hh"
Index: /trunk/src/lib/sdl.cc
===================================================================
--- /trunk/src/lib/sdl.cc	(revision 394)
+++ /trunk/src/lib/sdl.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lib/sdl.hh"
Index: /trunk/src/lib/sdl_image.cc
===================================================================
--- /trunk/src/lib/sdl_image.cc	(revision 394)
+++ /trunk/src/lib/sdl_image.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lib/sdl_image.hh"
Index: /trunk/src/lib/sdl_mixer.cc
===================================================================
--- /trunk/src/lib/sdl_mixer.cc	(revision 394)
+++ /trunk/src/lib/sdl_mixer.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lib/sdl_mixer.hh"
Index: /trunk/src/lua/lua_area.cc
===================================================================
--- /trunk/src/lua/lua_area.cc	(revision 394)
+++ /trunk/src/lua/lua_area.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lua/lua_area.hh"
Index: /trunk/src/lua/lua_aux.cc
===================================================================
--- /trunk/src/lua/lua_aux.cc	(revision 394)
+++ /trunk/src/lua/lua_aux.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lua/lua_aux.hh"
Index: /trunk/src/lua/lua_flags.cc
===================================================================
--- /trunk/src/lua/lua_flags.cc	(revision 394)
+++ /trunk/src/lua/lua_flags.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lua/lua_flags.hh"
Index: /trunk/src/lua/lua_function.cc
===================================================================
--- /trunk/src/lua/lua_function.cc	(revision 394)
+++ /trunk/src/lua/lua_function.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include <nv/lua/lua_function.hh>
Index: /trunk/src/lua/lua_glm.cc
===================================================================
--- /trunk/src/lua/lua_glm.cc	(revision 394)
+++ /trunk/src/lua/lua_glm.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lua/lua_glm.hh"
Index: /trunk/src/lua/lua_handle.cc
===================================================================
--- /trunk/src/lua/lua_handle.cc	(revision 394)
+++ /trunk/src/lua/lua_handle.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of Nova libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lua/lua_handle.hh"
Index: /trunk/src/lua/lua_map_area.cc
===================================================================
--- /trunk/src/lua/lua_map_area.cc	(revision 394)
+++ /trunk/src/lua/lua_map_area.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lua/lua_map_area.hh"
Index: /trunk/src/lua/lua_map_tile.cc
===================================================================
--- /trunk/src/lua/lua_map_tile.cc	(revision 394)
+++ /trunk/src/lua/lua_map_tile.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lua/lua_map_tile.hh"
Index: /trunk/src/lua/lua_nova.cc
===================================================================
--- /trunk/src/lua/lua_nova.cc	(revision 394)
+++ /trunk/src/lua/lua_nova.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lua/lua_nova.hh"
Index: /trunk/src/lua/lua_path.cc
===================================================================
--- /trunk/src/lua/lua_path.cc	(revision 394)
+++ /trunk/src/lua/lua_path.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lua/lua_path.hh"
Index: /trunk/src/lua/lua_raw.cc
===================================================================
--- /trunk/src/lua/lua_raw.cc	(revision 394)
+++ /trunk/src/lua/lua_raw.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lua/lua_raw.hh"
Index: /trunk/src/lua/lua_state.cc
===================================================================
--- /trunk/src/lua/lua_state.cc	(revision 394)
+++ /trunk/src/lua/lua_state.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lua/lua_state.hh"
Index: /trunk/src/lua/lua_values.cc
===================================================================
--- /trunk/src/lua/lua_values.cc	(revision 394)
+++ /trunk/src/lua/lua_values.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/lua/lua_values.hh"
Index: /trunk/src/rocket/rocket_interface.cc
===================================================================
--- /trunk/src/rocket/rocket_interface.cc	(revision 394)
+++ /trunk/src/rocket/rocket_interface.cc	(revision 395)
@@ -1,2 +1,8 @@
+// Copyright (C) 2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
+
 #include "nv/rocket/rocket_interface.hh"
 
Index: /trunk/src/rogue/fov_recursive_shadowcasting.cc
===================================================================
--- /trunk/src/rogue/fov_recursive_shadowcasting.cc	(revision 394)
+++ /trunk/src/rogue/fov_recursive_shadowcasting.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/rogue/fov_recursive_shadowcasting.hh"
Index: /trunk/src/sdl/sdl_audio.cc
===================================================================
--- /trunk/src/sdl/sdl_audio.cc	(revision 394)
+++ /trunk/src/sdl/sdl_audio.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2012-2014 ChaosForge Ltd
+// Copyright (C) 2012-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/sdl/sdl_audio.hh"
Index: /trunk/src/sdl/sdl_input.cc
===================================================================
--- /trunk/src/sdl/sdl_input.cc	(revision 394)
+++ /trunk/src/sdl/sdl_input.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/sdl/sdl_input.hh"
Index: /trunk/src/sdl/sdl_window.cc
===================================================================
--- /trunk/src/sdl/sdl_window.cc	(revision 394)
+++ /trunk/src/sdl/sdl_window.cc	(revision 395)
@@ -1,5 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
-// This file is part of Nova Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// Copyright (C) 2014-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/sdl/sdl_window.hh"
Index: /trunk/src/sdl/sdl_window_manager.cc
===================================================================
--- /trunk/src/sdl/sdl_window_manager.cc	(revision 394)
+++ /trunk/src/sdl/sdl_window_manager.cc	(revision 395)
@@ -1,5 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd
-// This file is part of Nova Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// Copyright (C) 2014-2015 ChaosForge Ltd
+// http://chaosforge.org/
+//
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/sdl/sdl_window_manager.hh"
Index: /trunk/src/stl/assert.cc
===================================================================
--- /trunk/src/stl/assert.cc	(revision 394)
+++ /trunk/src/stl/assert.cc	(revision 395)
@@ -2,11 +2,11 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
-#define NV_CORE_COMMON_HH
+#define NV_BASE_COMMON_HH
 #define NV_INTERNAL_INCLUDE
 #include "nv/stl/assert.hh"
-#undef NV_CORE_COMMON_HH
+#undef NV_BASE_COMMON_HH
 
 #if NV_COMPILER == NV_MSVC
Index: /trunk/src/stl/capi.cc
===================================================================
--- /trunk/src/stl/capi.cc	(revision 394)
+++ /trunk/src/stl/capi.cc	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/stl/capi.hh"
Index: /trunk/src/stl/hash_table.cc
===================================================================
--- /trunk/src/stl/hash_table.cc	(revision 394)
+++ /trunk/src/stl/hash_table.cc	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include "nv/stl/container/hash_table.hh"
Index: /trunk/src/stl/string.cc
===================================================================
--- /trunk/src/stl/string.cc	(revision 394)
+++ /trunk/src/stl/string.cc	(revision 395)
@@ -2,6 +2,6 @@
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 //
 // TODO: speedup conversion by doing divisions by 100
Index: /trunk/src/wx/wx_canvas.cc
===================================================================
--- /trunk/src/wx/wx_canvas.cc	(revision 394)
+++ /trunk/src/wx/wx_canvas.cc	(revision 395)
@@ -1,7 +1,7 @@
-// Copyright (C) 2014 ChaosForge Ltd 
+// Copyright (C) 2014-2015 ChaosForge Ltd
 // http://chaosforge.org/
 //
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
+// This file is part of Nova libraries. 
+// For conditions of distribution and use, see copying.txt file in root folder.
 
 #include <nv/wx/wx_canvas.hh>
