Index: /trunk/ab5.0/abdev/BasicCompiler_Common/src/ObjectModule.cpp
===================================================================
--- /trunk/ab5.0/abdev/BasicCompiler_Common/src/ObjectModule.cpp	(revision 516)
+++ /trunk/ab5.0/abdev/BasicCompiler_Common/src/ObjectModule.cpp	(revision 517)
@@ -42,5 +42,4 @@
 #include <BoostSerializationSupport.h>
 
-#include <abdev/ab_common/Environment.h>
 #include <abdev/ab_common/include/ab_common.h>
 
Index: unk/ab5.0/abdev/ab_common/Environment.cpp
===================================================================
--- /trunk/ab5.0/abdev/ab_common/Environment.cpp	(revision 516)
+++ 	(revision )
@@ -1,29 +1,0 @@
-#include "stdafx.h"
-
-std::string ActiveBasic::Common::Environment::rootPath;
-
-using namespace ActiveBasic::Common;
-
-void Environment::SetAbdevRootPath( const std::string &rootPath )
-{
-	Environment::rootPath = Jenga::Common::Path::MakeFullPath( rootPath, Jenga::Common::Environment::GetAppDir() );
-}
-const std::string Environment::GetAbdevRootPath()
-{
-	if( rootPath.empty() )
-	{
-		SetAbdevRootPath( "" );
-	}
-	return rootPath;
-}
-const std::string Environment::GetCompilerExePath( Platform::EnumType platform )
-{
-	switch( platform )
-	{
-	case Platform::X86:
-		return rootPath + "\\bin\\x86\\abc.exe";
-	case Platform::X64:
-		return rootPath + "\\bin\\x64\\abc.exe";
-	}
-	throw;
-}
Index: unk/ab5.0/abdev/ab_common/Environment.h
===================================================================
--- /trunk/ab5.0/abdev/ab_common/Environment.h	(revision 516)
+++ 	(revision )
@@ -1,32 +1,0 @@
-#pragma once
-
-namespace ActiveBasic{ namespace Common{
-
-
-struct Platform
-{
-	enum EnumType
-	{
-		X86,
-		X64,
-	};
-};
-
-class Environment
-{
-	static std::string rootPath;
-public:
-	static void SetAbdevRootPath( const std::string &rootPath );
-
-	static const std::string GetAbdevRootPath();
-
-	static const std::string GetAbdevSystemDirPath()
-	{
-		return GetAbdevRootPath() + "\\system";
-	}
-
-	static const std::string GetCompilerExePath( Platform::EnumType platform );
-};
-
-
-}}
Index: /trunk/ab5.0/abdev/ab_common/ab_common.vcproj
===================================================================
--- /trunk/ab5.0/abdev/ab_common/ab_common.vcproj	(revision 516)
+++ /trunk/ab5.0/abdev/ab_common/ab_common.vcproj	(revision 517)
@@ -274,5 +274,5 @@
 			>
 			<File
-				RelativePath=".\Environment.cpp"
+				RelativePath=".\src\Environment.cpp"
 				>
 			</File>
@@ -340,5 +340,5 @@
 			</File>
 			<File
-				RelativePath=".\Environment.h"
+				RelativePath=".\include\Environment.h"
 				>
 			</File>
Index: /trunk/ab5.0/abdev/ab_common/include/Environment.h
===================================================================
--- /trunk/ab5.0/abdev/ab_common/include/Environment.h	(revision 517)
+++ /trunk/ab5.0/abdev/ab_common/include/Environment.h	(revision 517)
@@ -0,0 +1,32 @@
+#pragma once
+
+namespace ActiveBasic{ namespace Common{
+
+
+struct Platform
+{
+	enum EnumType
+	{
+		X86,
+		X64,
+	};
+};
+
+class Environment
+{
+	static std::string rootPath;
+public:
+	static void SetAbdevRootPath( const std::string &rootPath );
+
+	static const std::string GetAbdevRootPath();
+
+	static const std::string GetAbdevSystemDirPath()
+	{
+		return GetAbdevRootPath() + "\\system";
+	}
+
+	static const std::string GetCompilerExePath( Platform::EnumType platform );
+};
+
+
+}}
Index: /trunk/ab5.0/abdev/ab_common/include/ab_common.h
===================================================================
--- /trunk/ab5.0/abdev/ab_common/include/ab_common.h	(revision 516)
+++ /trunk/ab5.0/abdev/ab_common/include/ab_common.h	(revision 517)
@@ -1,4 +1,5 @@
 #pragma once
 
+#include "Environment.h"
 #include "Lexical/Namespace.h"
 #include "Lexical/NamespaceSupporter.h"
Index: /trunk/ab5.0/abdev/ab_common/src/Environment.cpp
===================================================================
--- /trunk/ab5.0/abdev/ab_common/src/Environment.cpp	(revision 517)
+++ /trunk/ab5.0/abdev/ab_common/src/Environment.cpp	(revision 517)
@@ -0,0 +1,29 @@
+#include "stdafx.h"
+
+std::string ActiveBasic::Common::Environment::rootPath;
+
+using namespace ActiveBasic::Common;
+
+void Environment::SetAbdevRootPath( const std::string &rootPath )
+{
+	Environment::rootPath = Jenga::Common::Path::MakeFullPath( rootPath, Jenga::Common::Environment::GetAppDir() );
+}
+const std::string Environment::GetAbdevRootPath()
+{
+	if( rootPath.empty() )
+	{
+		SetAbdevRootPath( "" );
+	}
+	return rootPath;
+}
+const std::string Environment::GetCompilerExePath( Platform::EnumType platform )
+{
+	switch( platform )
+	{
+	case Platform::X86:
+		return rootPath + "\\bin\\x86\\abc.exe";
+	case Platform::X64:
+		return rootPath + "\\bin\\x64\\abc.exe";
+	}
+	throw;
+}
Index: /trunk/ab5.0/abdev/ab_common/stdafx.h
===================================================================
--- /trunk/ab5.0/abdev/ab_common/stdafx.h	(revision 516)
+++ /trunk/ab5.0/abdev/ab_common/stdafx.h	(revision 517)
@@ -31,5 +31,4 @@
 #include <jenga/include/common/String.h>
 
-#include "Environment.h"
 #include "include/ab_common.h"
 
Index: /trunk/ab5.0/abdev/abdev/stdafx.h
===================================================================
--- /trunk/ab5.0/abdev/abdev/stdafx.h	(revision 516)
+++ /trunk/ab5.0/abdev/abdev/stdafx.h	(revision 517)
@@ -39,5 +39,4 @@
 #include <jenga/include/common/String.h>
 
-#include <abdev/ab_common/Environment.h>
 #include <abdev/ab_common/include/ab_common.h>
 
Index: /trunk/ab5.0/abdev/compiler_x64/stdafx.h
===================================================================
--- /trunk/ab5.0/abdev/compiler_x64/stdafx.h	(revision 516)
+++ /trunk/ab5.0/abdev/compiler_x64/stdafx.h	(revision 517)
@@ -31,5 +31,4 @@
 #include <jenga/include/common/String.h>
 
-#include <abdev/ab_common/Environment.h>
 #include <abdev/ab_common/include/ab_common.h>
 
Index: /trunk/ab5.0/abdev/compiler_x86/stdafx.h
===================================================================
--- /trunk/ab5.0/abdev/compiler_x86/stdafx.h	(revision 516)
+++ /trunk/ab5.0/abdev/compiler_x86/stdafx.h	(revision 517)
@@ -31,5 +31,4 @@
 #include <jenga/include/common/String.h>
 
-#include <abdev/ab_common/Environment.h>
 #include <abdev/ab_common/include/ab_common.h>