إعادة هيكلة

alifcommunity · Aug 8, 2024 · 5e1a058 · 5e1a058
1 parent ff7baab
commit 5e1a058
Show file tree

Hide file tree

Showing 180 changed files with 549 additions and 564 deletions.
diff --git a/linuxBuild/Makefile b/linuxBuild/Makefile
@@ -4,18 +4,18 @@ CPPFLAGS = -Wall -std=c++20
 SOURCE_DIR = ../source
 BUILD_DIR = build
 
-SOURCE_FILES = $(wildcard $(SOURCE_DIR)/Alif/*.cpp) $(wildcard $(SOURCE_DIR)/Objects/*.cpp)
+SOURCE_FILES = $(wildcard $(SOURCE_DIR)/Alif/*.cpp) $(wildcard $(SOURCE_DIR)/AlifCore/Objects/*.cpp)
 
-INCLUDES = -I$(SOURCE_DIR)/Alif -I$(SOURCE_DIR)/Include/Core -I$(SOURCE_DIR)/Include/Main
+INCLUDES = -I$(SOURCE_DIR)/Alif -I$(SOURCE_DIR)/AlifCore/Include/Core -I$(SOURCE_DIR)/AlifCore/Include/Main
 
-OBJECTS = $(SOURCE_FILES:$(SOURCE_DIR)/Objects/%/%.cpp=$(BUILD_DIR)/%.o)
+OBJECTS = $(SOURCE_FILES:$(SOURCE_DIR)/AlifCore/Objects/%/%.cpp=$(BUILD_DIR)/%.o)
 
 TARGET = $(BUILD_DIR)/alif
 
 ifeq ($(wildcard $(BUILD_DIR)),)
 $(BUILD_DIR):
 	mkdir -p $(BUILD_DIR)
-	@echo "تم إنشاء المجلد"
+	@echo "تم إنشاء المجلد - قم بإعادة البناء"
 endif
 
 all: $(TARGET)

diff --git a/source/Include/Core/AlifCore_ASDL.h → source/AlifCore/Include/Core/AlifCore_ASDL.h b/source/Include/Core/AlifCore_ASDL.h → source/AlifCore/Include/Core/AlifCore_ASDL.h
diff --git a/source/Include/Core/AlifCore_AST.h → source/AlifCore/Include/Core/AlifCore_AST.h b/source/Include/Core/AlifCore_AST.h → source/AlifCore/Include/Core/AlifCore_AST.h
diff --git a/source/Include/Core/AlifCore_Abstract.h → ...AlifCore/Include/Core/AlifCore_Abstract.h b/source/Include/Core/AlifCore_Abstract.h → ...AlifCore/Include/Core/AlifCore_Abstract.h
diff --git a/source/Include/Core/AlifCore_AlifCycle.h → ...lifCore/Include/Core/AlifCore_AlifCycle.h b/source/Include/Core/AlifCore_AlifCycle.h → ...lifCore/Include/Core/AlifCore_AlifCycle.h
diff --git a/source/Include/Core/AlifCore_AlifEval.h → ...AlifCore/Include/Core/AlifCore_AlifEval.h b/source/Include/Core/AlifCore_AlifEval.h → ...AlifCore/Include/Core/AlifCore_AlifEval.h
diff --git a/source/Include/Core/AlifCore_AlifRun.h → .../AlifCore/Include/Core/AlifCore_AlifRun.h b/source/Include/Core/AlifCore_AlifRun.h → .../AlifCore/Include/Core/AlifCore_AlifRun.h
diff --git a/source/Include/Core/AlifCore_AlifState.h → ...lifCore/Include/Core/AlifCore_AlifState.h b/source/Include/Core/AlifCore_AlifState.h → ...lifCore/Include/Core/AlifCore_AlifState.h
diff --git a/source/Include/Core/AlifCore_AlifThread.h → ...ifCore/Include/Core/AlifCore_AlifThread.h b/source/Include/Core/AlifCore_AlifThread.h → ...ifCore/Include/Core/AlifCore_AlifThread.h
diff --git a/source/Include/Core/AlifCore_AlifToken.h → ...lifCore/Include/Core/AlifCore_AlifToken.h b/source/Include/Core/AlifCore_AlifToken.h → ...lifCore/Include/Core/AlifCore_AlifToken.h
diff --git a/source/Include/Core/AlifCore_Backoff.h → .../AlifCore/Include/Core/AlifCore_Backoff.h b/source/Include/Core/AlifCore_Backoff.h → .../AlifCore/Include/Core/AlifCore_Backoff.h
diff --git a/source/Include/Core/AlifCore_BytesMethods.h → ...Core/Include/Core/AlifCore_BytesMethods.h b/source/Include/Core/AlifCore_BytesMethods.h → ...Core/Include/Core/AlifCore_BytesMethods.h
diff --git a/source/Include/Core/AlifCore_BytesObject.h → ...fCore/Include/Core/AlifCore_BytesObject.h b/source/Include/Core/AlifCore_BytesObject.h → ...fCore/Include/Core/AlifCore_BytesObject.h
diff --git a/source/Include/Core/AlifCore_Call.h → source/AlifCore/Include/Core/AlifCore_Call.h b/source/Include/Core/AlifCore_Call.h → source/AlifCore/Include/Core/AlifCore_Call.h
diff --git a/source/Include/Core/AlifCore_Code.h → source/AlifCore/Include/Core/AlifCore_Code.h b/source/Include/Core/AlifCore_Code.h → source/AlifCore/Include/Core/AlifCore_Code.h
diff --git a/source/Include/Core/AlifCore_Compile.h → .../AlifCore/Include/Core/AlifCore_Compile.h b/source/Include/Core/AlifCore_Compile.h → .../AlifCore/Include/Core/AlifCore_Compile.h
diff --git a/source/Include/Core/AlifCore_CondVar.h → .../AlifCore/Include/Core/AlifCore_CondVar.h b/source/Include/Core/AlifCore_CondVar.h → .../AlifCore/Include/Core/AlifCore_CondVar.h
diff --git a/source/Include/Core/AlifCore_Context.h → .../AlifCore/Include/Core/AlifCore_Context.h b/source/Include/Core/AlifCore_Context.h → .../AlifCore/Include/Core/AlifCore_Context.h
diff --git a/source/Include/Core/AlifCore_Dict.h → source/AlifCore/Include/Core/AlifCore_Dict.h b/source/Include/Core/AlifCore_Dict.h → source/AlifCore/Include/Core/AlifCore_Dict.h
diff --git a/source/Include/Core/AlifCore_DureRun.h → .../AlifCore/Include/Core/AlifCore_DureRun.h b/source/Include/Core/AlifCore_DureRun.h → .../AlifCore/Include/Core/AlifCore_DureRun.h
diff --git a/source/Include/Core/AlifCore_DureRunInit.h → ...fCore/Include/Core/AlifCore_DureRunInit.h b/source/Include/Core/AlifCore_DureRunInit.h → ...fCore/Include/Core/AlifCore_DureRunInit.h
diff --git a/source/Include/Core/AlifCore_FileUtils.h → ...lifCore/Include/Core/AlifCore_FileUtils.h b/source/Include/Core/AlifCore_FileUtils.h → ...lifCore/Include/Core/AlifCore_FileUtils.h
diff --git a/source/Include/Core/AlifCore_FlowGraph.h → ...lifCore/Include/Core/AlifCore_FlowGraph.h b/source/Include/Core/AlifCore_FlowGraph.h → ...lifCore/Include/Core/AlifCore_FlowGraph.h
diff --git a/source/Include/Core/AlifCore_Frame.h → ...ce/AlifCore/Include/Core/AlifCore_Frame.h b/source/Include/Core/AlifCore_Frame.h → ...ce/AlifCore/Include/Core/AlifCore_Frame.h
diff --git a/source/Include/Core/AlifCore_FreeList.h → ...AlifCore/Include/Core/AlifCore_FreeList.h b/source/Include/Core/AlifCore_FreeList.h → ...AlifCore/Include/Core/AlifCore_FreeList.h
diff --git a/source/Include/Core/AlifCore_Function.h → ...AlifCore/Include/Core/AlifCore_Function.h b/source/Include/Core/AlifCore_Function.h → ...AlifCore/Include/Core/AlifCore_Function.h
diff --git a/source/Include/Core/AlifCore_GC.h → source/AlifCore/Include/Core/AlifCore_GC.h b/source/Include/Core/AlifCore_GC.h → source/AlifCore/Include/Core/AlifCore_GC.h
diff --git a/...ce/Include/Core/AlifCore_GetConsoleLine.h → ...re/Include/Core/AlifCore_GetConsoleLine.h b/...ce/Include/Core/AlifCore_GetConsoleLine.h → ...re/Include/Core/AlifCore_GetConsoleLine.h
diff --git a/source/Include/Core/AlifCore_GlobalLock.h → ...ifCore/Include/Core/AlifCore_GlobalLock.h b/source/Include/Core/AlifCore_GlobalLock.h → ...ifCore/Include/Core/AlifCore_GlobalLock.h
diff --git a/source/Include/Core/AlifCore_GlobalObjects.h → ...ore/Include/Core/AlifCore_GlobalObjects.h b/source/Include/Core/AlifCore_GlobalObjects.h → ...ore/Include/Core/AlifCore_GlobalObjects.h
diff --git a/source/Include/Core/AlifCore_GlobalString.h → ...Core/Include/Core/AlifCore_GlobalString.h b/source/Include/Core/AlifCore_GlobalString.h → ...Core/Include/Core/AlifCore_GlobalString.h
diff --git a/.../Include/Core/AlifCore_HashArrayMapTree.h → .../Include/Core/AlifCore_HashArrayMapTree.h b/.../Include/Core/AlifCore_HashArrayMapTree.h → .../Include/Core/AlifCore_HashArrayMapTree.h
diff --git a/source/Include/Core/AlifCore_Import.h → ...e/AlifCore/Include/Core/AlifCore_Import.h b/source/Include/Core/AlifCore_Import.h → ...e/AlifCore/Include/Core/AlifCore_Import.h
diff --git a/source/Include/Core/AlifCore_InitConfig.h → ...ifCore/Include/Core/AlifCore_InitConfig.h b/source/Include/Core/AlifCore_InitConfig.h → ...ifCore/Include/Core/AlifCore_InitConfig.h
diff --git a/...ce/Include/Core/AlifCore_InstructionSeq.h → ...re/Include/Core/AlifCore_InstructionSeq.h b/...ce/Include/Core/AlifCore_InstructionSeq.h → ...re/Include/Core/AlifCore_InstructionSeq.h
diff --git a/source/Include/Core/AlifCore_Integer.h → .../AlifCore/Include/Core/AlifCore_Integer.h b/source/Include/Core/AlifCore_Integer.h → .../AlifCore/Include/Core/AlifCore_Integer.h
diff --git a/source/Include/Core/AlifCore_Interpreter.h → ...fCore/Include/Core/AlifCore_Interpreter.h b/source/Include/Core/AlifCore_Interpreter.h → ...fCore/Include/Core/AlifCore_Interpreter.h
diff --git a/source/Include/Core/AlifCore_Intrinsics.h → ...ifCore/Include/Core/AlifCore_Intrinsics.h b/source/Include/Core/AlifCore_Intrinsics.h → ...ifCore/Include/Core/AlifCore_Intrinsics.h
diff --git a/source/Include/Core/AlifCore_LList.h → ...ce/AlifCore/Include/Core/AlifCore_LList.h b/source/Include/Core/AlifCore_LList.h → ...ce/AlifCore/Include/Core/AlifCore_LList.h
diff --git a/source/Include/Core/AlifCore_List.h → source/AlifCore/Include/Core/AlifCore_List.h b/source/Include/Core/AlifCore_List.h → source/AlifCore/Include/Core/AlifCore_List.h
diff --git a/source/Include/Core/AlifCore_Lock.h → source/AlifCore/Include/Core/AlifCore_Lock.h b/source/Include/Core/AlifCore_Lock.h → source/AlifCore/Include/Core/AlifCore_Lock.h
diff --git a/source/Include/Core/AlifCore_Memory.h → ...e/AlifCore/Include/Core/AlifCore_Memory.h b/source/Include/Core/AlifCore_Memory.h → ...e/AlifCore/Include/Core/AlifCore_Memory.h
diff --git a/source/Include/Core/AlifCore_ModSupport.h → ...ifCore/Include/Core/AlifCore_ModSupport.h b/source/Include/Core/AlifCore_ModSupport.h → ...ifCore/Include/Core/AlifCore_ModSupport.h
diff --git a/source/Include/Core/AlifCore_ModuleObject.h → ...Core/Include/Core/AlifCore_ModuleObject.h b/source/Include/Core/AlifCore_ModuleObject.h → ...Core/Include/Core/AlifCore_ModuleObject.h
diff --git a/source/Include/Core/AlifCore_Object.h → ...e/AlifCore/Include/Core/AlifCore_Object.h b/source/Include/Core/AlifCore_Object.h → ...e/AlifCore/Include/Core/AlifCore_Object.h
diff --git a/source/Include/Core/AlifCore_ObjectState.h → ...fCore/Include/Core/AlifCore_ObjectState.h b/source/Include/Core/AlifCore_ObjectState.h → ...fCore/Include/Core/AlifCore_ObjectState.h
diff --git a/source/Include/Core/AlifCore_OpCodeData.h → ...ifCore/Include/Core/AlifCore_OpCodeData.h b/source/Include/Core/AlifCore_OpCodeData.h → ...ifCore/Include/Core/AlifCore_OpCodeData.h
diff --git a/source/Include/Core/AlifCore_OpCodeUtils.h → ...fCore/Include/Core/AlifCore_OpCodeUtils.h b/source/Include/Core/AlifCore_OpCodeUtils.h → ...fCore/Include/Core/AlifCore_OpCodeUtils.h
diff --git a/source/Include/Core/AlifCore_SymTable.h → ...AlifCore/Include/Core/AlifCore_SymTable.h b/source/Include/Core/AlifCore_SymTable.h → ...AlifCore/Include/Core/AlifCore_SymTable.h
diff --git a/source/Include/Core/AlifCore_Time.h → source/AlifCore/Include/Core/AlifCore_Time.h b/source/Include/Core/AlifCore_Time.h → source/AlifCore/Include/Core/AlifCore_Time.h
diff --git a/source/Include/Core/AlifCore_Tuple.h → ...ce/AlifCore/Include/Core/AlifCore_Tuple.h b/source/Include/Core/AlifCore_Tuple.h → ...ce/AlifCore/Include/Core/AlifCore_Tuple.h
diff --git a/source/Include/Core/AlifCore_TypeObject.h → ...ifCore/Include/Core/AlifCore_TypeObject.h b/source/Include/Core/AlifCore_TypeObject.h → ...ifCore/Include/Core/AlifCore_TypeObject.h
diff --git a/source/Include/Core/AlifCore_UString.h → .../AlifCore/Include/Core/AlifCore_UString.h b/source/Include/Core/AlifCore_UString.h → .../AlifCore/Include/Core/AlifCore_UString.h
diff --git a/source/Include/Main/Abstract.h → source/AlifCore/Include/Main/Abstract.h b/source/Include/Main/Abstract.h → source/AlifCore/Include/Main/Abstract.h
diff --git a/source/Include/Main/AlifBuffer.h → source/AlifCore/Include/Main/AlifBuffer.h b/source/Include/Main/AlifBuffer.h → source/AlifCore/Include/Main/AlifBuffer.h
diff --git a/source/Include/Main/AlifCapsule.h → source/AlifCore/Include/Main/AlifCapsule.h b/source/Include/Main/AlifCapsule.h → source/AlifCore/Include/Main/AlifCapsule.h
diff --git a/source/Include/Main/AlifConfig.h → source/AlifCore/Include/Main/AlifConfig.h b/source/Include/Main/AlifConfig.h → source/AlifCore/Include/Main/AlifConfig.h
diff --git a/source/Include/Main/AlifCppType.h → source/AlifCore/Include/Main/AlifCppType.h b/source/Include/Main/AlifCppType.h → source/AlifCore/Include/Main/AlifCppType.h
diff --git a/source/Include/Main/AlifErrors.h → source/AlifCore/Include/Main/AlifErrors.h b/source/Include/Main/AlifErrors.h → source/AlifCore/Include/Main/AlifErrors.h
diff --git a/source/Include/Main/AlifEval.h → source/AlifCore/Include/Main/AlifEval.h b/source/Include/Main/AlifEval.h → source/AlifCore/Include/Main/AlifEval.h
diff --git a/source/Include/Main/AlifEvalMacros.h → ...ce/AlifCore/Include/Main/AlifEvalMacros.h b/source/Include/Main/AlifEvalMacros.h → ...ce/AlifCore/Include/Main/AlifEvalMacros.h
diff --git a/source/Include/Main/AlifLexer.h → source/AlifCore/Include/Main/AlifLexer.h b/source/Include/Main/AlifLexer.h → source/AlifCore/Include/Main/AlifLexer.h
diff --git a/source/Include/Main/AlifMacro.h → source/AlifCore/Include/Main/AlifMacro.h b/source/Include/Main/AlifMacro.h → source/AlifCore/Include/Main/AlifMacro.h
diff --git a/source/Include/Main/AlifObject.h → source/AlifCore/Include/Main/AlifObject.h b/source/Include/Main/AlifObject.h → source/AlifCore/Include/Main/AlifObject.h
diff --git a/source/Include/Main/AlifParserEngine.h → .../AlifCore/Include/Main/AlifParserEngine.h b/source/Include/Main/AlifParserEngine.h → .../AlifCore/Include/Main/AlifParserEngine.h
diff --git a/source/Include/Main/AlifPort.h → source/AlifCore/Include/Main/AlifPort.h b/source/Include/Main/AlifPort.h → source/AlifCore/Include/Main/AlifPort.h
diff --git a/source/Include/Main/AlifRun.h → source/AlifCore/Include/Main/AlifRun.h b/source/Include/Main/AlifRun.h → source/AlifCore/Include/Main/AlifRun.h
diff --git a/source/Include/Main/AlifState.h → source/AlifCore/Include/Main/AlifState.h b/source/Include/Main/AlifState.h → source/AlifCore/Include/Main/AlifState.h
diff --git a/source/Include/Main/AlifThread.h → source/AlifCore/Include/Main/AlifThread.h b/source/Include/Main/AlifThread.h → source/AlifCore/Include/Main/AlifThread.h
diff --git a/source/Include/Main/AlifTime.h → source/AlifCore/Include/Main/AlifTime.h b/source/Include/Main/AlifTime.h → source/AlifCore/Include/Main/AlifTime.h
diff --git a/source/Include/Main/AlifTokenState.h → ...ce/AlifCore/Include/Main/AlifTokenState.h b/source/Include/Main/AlifTokenState.h → ...ce/AlifCore/Include/Main/AlifTokenState.h
diff --git a/source/Include/Main/AlifTypeDefs.h → source/AlifCore/Include/Main/AlifTypeDefs.h b/source/Include/Main/AlifTypeDefs.h → source/AlifCore/Include/Main/AlifTypeDefs.h
diff --git a/source/Include/Main/AlifVersion.h → source/AlifCore/Include/Main/AlifVersion.h b/source/Include/Main/AlifVersion.h → source/AlifCore/Include/Main/AlifVersion.h
diff --git a/source/Include/Main/BoolObject.h → source/AlifCore/Include/Main/BoolObject.h b/source/Include/Main/BoolObject.h → source/AlifCore/Include/Main/BoolObject.h
diff --git a/source/Include/Main/BuiltinsModule.h → ...ce/AlifCore/Include/Main/BuiltinsModule.h b/source/Include/Main/BuiltinsModule.h → ...ce/AlifCore/Include/Main/BuiltinsModule.h
diff --git a/source/Include/Main/BytesObject.h → source/AlifCore/Include/Main/BytesObject.h b/source/Include/Main/BytesObject.h → source/AlifCore/Include/Main/BytesObject.h
diff --git a/source/Include/Main/ClassObject.h → source/AlifCore/Include/Main/ClassObject.h b/source/Include/Main/ClassObject.h → source/AlifCore/Include/Main/ClassObject.h
diff --git a/source/Include/Main/Code.h → source/AlifCore/Include/Main/Code.h b/source/Include/Main/Code.h → source/AlifCore/Include/Main/Code.h
diff --git a/source/Include/Main/Compile.h → source/AlifCore/Include/Main/Compile.h b/source/Include/Main/Compile.h → source/AlifCore/Include/Main/Compile.h
diff --git a/source/Include/Main/DescrObject.h → source/AlifCore/Include/Main/DescrObject.h b/source/Include/Main/DescrObject.h → source/AlifCore/Include/Main/DescrObject.h
diff --git a/source/Include/Main/DictObject.h → source/AlifCore/Include/Main/DictObject.h b/source/Include/Main/DictObject.h → source/AlifCore/Include/Main/DictObject.h
diff --git a/source/Include/Main/ErrorCode.h → source/AlifCore/Include/Main/ErrorCode.h b/source/Include/Main/ErrorCode.h → source/AlifCore/Include/Main/ErrorCode.h
diff --git a/source/Include/Main/FastSearch.h → source/AlifCore/Include/Main/FastSearch.h b/source/Include/Main/FastSearch.h → source/AlifCore/Include/Main/FastSearch.h
diff --git a/source/Include/Main/FileManip.h → source/AlifCore/Include/Main/FileManip.h b/source/Include/Main/FileManip.h → source/AlifCore/Include/Main/FileManip.h
diff --git a/source/Include/Main/Find.h → source/AlifCore/Include/Main/Find.h b/source/Include/Main/Find.h → source/AlifCore/Include/Main/Find.h
diff --git a/source/Include/Main/FloatObject.h → source/AlifCore/Include/Main/FloatObject.h b/source/Include/Main/FloatObject.h → source/AlifCore/Include/Main/FloatObject.h
diff --git a/source/Include/Main/FunctionObject.h → ...ce/AlifCore/Include/Main/FunctionObject.h b/source/Include/Main/FunctionObject.h → ...ce/AlifCore/Include/Main/FunctionObject.h
diff --git a/source/Include/Main/GenericAliasObject.h → ...lifCore/Include/Main/GenericAliasObject.h b/source/Include/Main/GenericAliasObject.h → ...lifCore/Include/Main/GenericAliasObject.h
diff --git a/source/Include/Main/Helpers.h → source/AlifCore/Include/Main/Helpers.h b/source/Include/Main/Helpers.h → source/AlifCore/Include/Main/Helpers.h
diff --git a/source/Include/Main/Import.h → source/AlifCore/Include/Main/Import.h b/source/Include/Main/Import.h → source/AlifCore/Include/Main/Import.h
diff --git a/source/Include/Main/InitConfig.h → source/AlifCore/Include/Main/InitConfig.h b/source/Include/Main/InitConfig.h → source/AlifCore/Include/Main/InitConfig.h
diff --git a/source/Include/Main/IntegerObject.h → source/AlifCore/Include/Main/IntegerObject.h b/source/Include/Main/IntegerObject.h → source/AlifCore/Include/Main/IntegerObject.h
diff --git a/source/Include/Main/IterObject.h → source/AlifCore/Include/Main/IterObject.h b/source/Include/Main/IterObject.h → source/AlifCore/Include/Main/IterObject.h
diff --git a/source/Include/Main/ListObject.h → source/AlifCore/Include/Main/ListObject.h b/source/Include/Main/ListObject.h → source/AlifCore/Include/Main/ListObject.h
diff --git a/source/Include/Main/MethodObject.h → source/AlifCore/Include/Main/MethodObject.h b/source/Include/Main/MethodObject.h → source/AlifCore/Include/Main/MethodObject.h
diff --git a/source/Include/Main/ModSupport.h → source/AlifCore/Include/Main/ModSupport.h b/source/Include/Main/ModSupport.h → source/AlifCore/Include/Main/ModSupport.h
diff --git a/source/Include/Main/ModuleObject.h → source/AlifCore/Include/Main/ModuleObject.h b/source/Include/Main/ModuleObject.h → source/AlifCore/Include/Main/ModuleObject.h
diff --git a/source/Include/Main/ObjImpl.h → source/AlifCore/Include/Main/ObjImpl.h b/source/Include/Main/ObjImpl.h → source/AlifCore/Include/Main/ObjImpl.h
diff --git a/source/Include/Main/OpCode.h → source/AlifCore/Include/Main/OpCode.h b/source/Include/Main/OpCode.h → source/AlifCore/Include/Main/OpCode.h
diff --git a/source/Include/Main/OpCodeCases.h → source/AlifCore/Include/Main/OpCodeCases.h b/source/Include/Main/OpCodeCases.h → source/AlifCore/Include/Main/OpCodeCases.h
diff --git a/source/Include/Main/OpCodeIDs.h → source/AlifCore/Include/Main/OpCodeIDs.h b/source/Include/Main/OpCodeIDs.h → source/AlifCore/Include/Main/OpCodeIDs.h
diff --git a/source/Include/Main/SetObject.h → source/AlifCore/Include/Main/SetObject.h b/source/Include/Main/SetObject.h → source/AlifCore/Include/Main/SetObject.h
diff --git a/source/Include/Main/SliceObject.h → source/AlifCore/Include/Main/SliceObject.h b/source/Include/Main/SliceObject.h → source/AlifCore/Include/Main/SliceObject.h
diff --git a/source/Include/Main/Split.h → source/AlifCore/Include/Main/Split.h b/source/Include/Main/Split.h → source/AlifCore/Include/Main/Split.h
diff --git a/source/Include/Main/StringParser.h → source/AlifCore/Include/Main/StringParser.h b/source/Include/Main/StringParser.h → source/AlifCore/Include/Main/StringParser.h
diff --git a/source/Include/Main/Thread_PThread.h → ...ce/AlifCore/Include/Main/Thread_PThread.h b/source/Include/Main/Thread_PThread.h → ...ce/AlifCore/Include/Main/Thread_PThread.h
diff --git a/source/Include/Main/Thread_nt.h → source/AlifCore/Include/Main/Thread_nt.h b/source/Include/Main/Thread_nt.h → source/AlifCore/Include/Main/Thread_nt.h
diff --git a/source/Include/Main/Tokenizer.h → source/AlifCore/Include/Main/Tokenizer.h b/source/Include/Main/Tokenizer.h → source/AlifCore/Include/Main/Tokenizer.h
diff --git a/source/Include/Main/TupleObject.h → source/AlifCore/Include/Main/TupleObject.h b/source/Include/Main/TupleObject.h → source/AlifCore/Include/Main/TupleObject.h
diff --git a/source/Include/Main/UStrObject.h → source/AlifCore/Include/Main/UStrObject.h b/source/Include/Main/UStrObject.h → source/AlifCore/Include/Main/UStrObject.h
diff --git a/source/Objects/ASDL.cpp → source/AlifCore/Objects/ASDL.cpp b/source/Objects/ASDL.cpp → source/AlifCore/Objects/ASDL.cpp
diff --git a/source/Objects/ASTOptimize.cpp → source/AlifCore/Objects/ASTOptimize.cpp b/source/Objects/ASTOptimize.cpp → source/AlifCore/Objects/ASTOptimize.cpp
diff --git a/source/Objects/Abstract.cpp → source/AlifCore/Objects/Abstract.cpp b/source/Objects/Abstract.cpp → source/AlifCore/Objects/Abstract.cpp
diff --git a/source/Objects/ActionHelpers.cpp → source/AlifCore/Objects/ActionHelpers.cpp b/source/Objects/ActionHelpers.cpp → source/AlifCore/Objects/ActionHelpers.cpp
diff --git a/source/Objects/AlifAST.cpp → source/AlifCore/Objects/AlifAST.cpp b/source/Objects/AlifAST.cpp → source/AlifCore/Objects/AlifAST.cpp
diff --git a/source/Objects/AlifAssemble.cpp → source/AlifCore/Objects/AlifAssemble.cpp b/source/Objects/AlifAssemble.cpp → source/AlifCore/Objects/AlifAssemble.cpp
diff --git a/source/Objects/AlifCompiler.cpp → source/AlifCore/Objects/AlifCompiler.cpp b/source/Objects/AlifCompiler.cpp → source/AlifCore/Objects/AlifCompiler.cpp
diff --git a/source/Objects/AlifCppType.cpp → source/AlifCore/Objects/AlifCppType.cpp b/source/Objects/AlifCppType.cpp → source/AlifCore/Objects/AlifCppType.cpp
diff --git a/source/Objects/AlifCycle.cpp → source/AlifCore/Objects/AlifCycle.cpp b/source/Objects/AlifCycle.cpp → source/AlifCore/Objects/AlifCycle.cpp
diff --git a/source/Objects/AlifEval.cpp → source/AlifCore/Objects/AlifEval.cpp b/source/Objects/AlifEval.cpp → source/AlifCore/Objects/AlifEval.cpp
diff --git a/source/Objects/AlifFlowGraph.cpp → source/AlifCore/Objects/AlifFlowGraph.cpp b/source/Objects/AlifFlowGraph.cpp → source/AlifCore/Objects/AlifFlowGraph.cpp
diff --git a/source/Objects/AlifLexer.cpp → source/AlifCore/Objects/AlifLexer.cpp b/source/Objects/AlifLexer.cpp → source/AlifCore/Objects/AlifLexer.cpp
diff --git a/source/Objects/AlifObject.cpp → source/AlifCore/Objects/AlifObject.cpp b/source/Objects/AlifObject.cpp → source/AlifCore/Objects/AlifObject.cpp
diff --git a/source/Objects/AlifParser.cpp → source/AlifCore/Objects/AlifParser.cpp b/source/Objects/AlifParser.cpp → source/AlifCore/Objects/AlifParser.cpp
diff --git a/source/Objects/AlifParserEngine.cpp → source/AlifCore/Objects/AlifParserEngine.cpp b/source/Objects/AlifParserEngine.cpp → source/AlifCore/Objects/AlifParserEngine.cpp
diff --git a/source/Objects/AlifParserEngineErrors.cpp → ...ifCore/Objects/AlifParserEngineErrors.cpp b/source/Objects/AlifParserEngineErrors.cpp → ...ifCore/Objects/AlifParserEngineErrors.cpp
diff --git a/source/Objects/AlifRun.cpp → source/AlifCore/Objects/AlifRun.cpp b/source/Objects/AlifRun.cpp → source/AlifCore/Objects/AlifRun.cpp
diff --git a/source/Objects/AlifState.cpp → source/AlifCore/Objects/AlifState.cpp b/source/Objects/AlifState.cpp → source/AlifCore/Objects/AlifState.cpp
diff --git a/source/Objects/AlifSymTable.cpp → source/AlifCore/Objects/AlifSymTable.cpp b/source/Objects/AlifSymTable.cpp → source/AlifCore/Objects/AlifSymTable.cpp
diff --git a/source/Objects/AlifTime.cpp → source/AlifCore/Objects/AlifTime.cpp b/source/Objects/AlifTime.cpp → source/AlifCore/Objects/AlifTime.cpp
diff --git a/source/Objects/AlifToken.cpp → source/AlifCore/Objects/AlifToken.cpp b/source/Objects/AlifToken.cpp → source/AlifCore/Objects/AlifToken.cpp
diff --git a/source/Objects/AlifTokenState.cpp → source/AlifCore/Objects/AlifTokenState.cpp b/source/Objects/AlifTokenState.cpp → source/AlifCore/Objects/AlifTokenState.cpp
diff --git a/source/Objects/BoolObject.cpp → source/AlifCore/Objects/BoolObject.cpp b/source/Objects/BoolObject.cpp → source/AlifCore/Objects/BoolObject.cpp
diff --git a/source/Objects/BuiltinsModule.cpp → source/AlifCore/Objects/BuiltinsModule.cpp b/source/Objects/BuiltinsModule.cpp → source/AlifCore/Objects/BuiltinsModule.cpp
diff --git a/source/Objects/BytesMethods.cpp → source/AlifCore/Objects/BytesMethods.cpp b/source/Objects/BytesMethods.cpp → source/AlifCore/Objects/BytesMethods.cpp
diff --git a/source/Objects/BytesObject.cpp → source/AlifCore/Objects/BytesObject.cpp b/source/Objects/BytesObject.cpp → source/AlifCore/Objects/BytesObject.cpp
diff --git a/source/Objects/Call.cpp → source/AlifCore/Objects/Call.cpp b/source/Objects/Call.cpp → source/AlifCore/Objects/Call.cpp
diff --git a/source/Objects/Capsule.cpp → source/AlifCore/Objects/Capsule.cpp b/source/Objects/Capsule.cpp → source/AlifCore/Objects/Capsule.cpp
diff --git a/source/Objects/ClassObject.cpp → source/AlifCore/Objects/ClassObject.cpp b/source/Objects/ClassObject.cpp → source/AlifCore/Objects/ClassObject.cpp
diff --git a/source/Objects/CodeObject.cpp → source/AlifCore/Objects/CodeObject.cpp b/source/Objects/CodeObject.cpp → source/AlifCore/Objects/CodeObject.cpp
diff --git a/source/Objects/ConfigMinimal.cpp → source/AlifCore/Objects/ConfigMinimal.cpp b/source/Objects/ConfigMinimal.cpp → source/AlifCore/Objects/ConfigMinimal.cpp
diff --git a/source/Objects/DescrObject.cpp → source/AlifCore/Objects/DescrObject.cpp b/source/Objects/DescrObject.cpp → source/AlifCore/Objects/DescrObject.cpp
diff --git a/source/Objects/DictObject.cpp → source/AlifCore/Objects/DictObject.cpp b/source/Objects/DictObject.cpp → source/AlifCore/Objects/DictObject.cpp
diff --git a/source/Objects/FileManip.cpp → source/AlifCore/Objects/FileManip.cpp b/source/Objects/FileManip.cpp → source/AlifCore/Objects/FileManip.cpp
diff --git a/source/Objects/FileObject.cpp → source/AlifCore/Objects/FileObject.cpp b/source/Objects/FileObject.cpp → source/AlifCore/Objects/FileObject.cpp
diff --git a/source/Objects/FileTokenizer.cpp → source/AlifCore/Objects/FileTokenizer.cpp b/source/Objects/FileTokenizer.cpp → source/AlifCore/Objects/FileTokenizer.cpp
diff --git a/source/Objects/FloatObject.cpp → source/AlifCore/Objects/FloatObject.cpp b/source/Objects/FloatObject.cpp → source/AlifCore/Objects/FloatObject.cpp
diff --git a/source/Objects/FrameObject.cpp → source/AlifCore/Objects/FrameObject.cpp b/source/Objects/FrameObject.cpp → source/AlifCore/Objects/FrameObject.cpp
diff --git a/source/Objects/FunctionObject.cpp → source/AlifCore/Objects/FunctionObject.cpp b/source/Objects/FunctionObject.cpp → source/AlifCore/Objects/FunctionObject.cpp
diff --git a/source/Objects/GC.cpp → source/AlifCore/Objects/GC.cpp b/source/Objects/GC.cpp → source/AlifCore/Objects/GC.cpp
diff --git a/source/Objects/GenericAliasObject.cpp → ...e/AlifCore/Objects/GenericAliasObject.cpp b/source/Objects/GenericAliasObject.cpp → ...e/AlifCore/Objects/GenericAliasObject.cpp
diff --git a/source/Objects/GetArgs.cpp → source/AlifCore/Objects/GetArgs.cpp b/source/Objects/GetArgs.cpp → source/AlifCore/Objects/GetArgs.cpp
diff --git a/source/Objects/GetConsoleLine.cpp → source/AlifCore/Objects/GetConsoleLine.cpp b/source/Objects/GetConsoleLine.cpp → source/AlifCore/Objects/GetConsoleLine.cpp
diff --git a/source/Objects/GetVersion.cpp → source/AlifCore/Objects/GetVersion.cpp b/source/Objects/GetVersion.cpp → source/AlifCore/Objects/GetVersion.cpp
diff --git a/source/Objects/Import.cpp → source/AlifCore/Objects/Import.cpp b/source/Objects/Import.cpp → source/AlifCore/Objects/Import.cpp
diff --git a/source/Objects/InitConfig.cpp → source/AlifCore/Objects/InitConfig.cpp b/source/Objects/InitConfig.cpp → source/AlifCore/Objects/InitConfig.cpp
diff --git a/source/Objects/InstructionSeq.cpp → source/AlifCore/Objects/InstructionSeq.cpp b/source/Objects/InstructionSeq.cpp → source/AlifCore/Objects/InstructionSeq.cpp
diff --git a/source/Objects/Instrumentation.cpp → source/AlifCore/Objects/Instrumentation.cpp b/source/Objects/Instrumentation.cpp → source/AlifCore/Objects/Instrumentation.cpp
diff --git a/source/Objects/IntegerObject.cpp → source/AlifCore/Objects/IntegerObject.cpp b/source/Objects/IntegerObject.cpp → source/AlifCore/Objects/IntegerObject.cpp
diff --git a/source/Objects/IterObject.cpp → source/AlifCore/Objects/IterObject.cpp b/source/Objects/IterObject.cpp → source/AlifCore/Objects/IterObject.cpp
diff --git a/source/Objects/ListObject.cpp → source/AlifCore/Objects/ListObject.cpp b/source/Objects/ListObject.cpp → source/AlifCore/Objects/ListObject.cpp
diff --git a/source/Objects/Memory.cpp → source/AlifCore/Objects/Memory.cpp b/source/Objects/Memory.cpp → source/AlifCore/Objects/Memory.cpp
diff --git a/source/Objects/MethodObject.cpp → source/AlifCore/Objects/MethodObject.cpp b/source/Objects/MethodObject.cpp → source/AlifCore/Objects/MethodObject.cpp
diff --git a/source/Objects/ModuleObject.cpp → source/AlifCore/Objects/ModuleObject.cpp b/source/Objects/ModuleObject.cpp → source/AlifCore/Objects/ModuleObject.cpp
diff --git a/source/Objects/SetObject.cpp → source/AlifCore/Objects/SetObject.cpp b/source/Objects/SetObject.cpp → source/AlifCore/Objects/SetObject.cpp
diff --git a/source/Objects/SliceObject.cpp → source/AlifCore/Objects/SliceObject.cpp b/source/Objects/SliceObject.cpp → source/AlifCore/Objects/SliceObject.cpp
diff --git a/source/Objects/Specialize.cpp → source/AlifCore/Objects/Specialize.cpp b/source/Objects/Specialize.cpp → source/AlifCore/Objects/Specialize.cpp
diff --git a/source/Objects/StringParser.cpp → source/AlifCore/Objects/StringParser.cpp b/source/Objects/StringParser.cpp → source/AlifCore/Objects/StringParser.cpp
diff --git a/source/Objects/SysModule.cpp → source/AlifCore/Objects/SysModule.cpp b/source/Objects/SysModule.cpp → source/AlifCore/Objects/SysModule.cpp
diff --git a/source/Objects/Thread.cpp → source/AlifCore/Objects/Thread.cpp b/source/Objects/Thread.cpp → source/AlifCore/Objects/Thread.cpp
diff --git a/source/Objects/TupleObject.cpp → source/AlifCore/Objects/TupleObject.cpp b/source/Objects/TupleObject.cpp → source/AlifCore/Objects/TupleObject.cpp
diff --git a/source/Objects/TypeObject.cpp → source/AlifCore/Objects/TypeObject.cpp b/source/Objects/TypeObject.cpp → source/AlifCore/Objects/TypeObject.cpp
diff --git a/source/Objects/UStrObject.cpp → source/AlifCore/Objects/UStrObject.cpp b/source/Objects/UStrObject.cpp → source/AlifCore/Objects/UStrObject.cpp
diff --git a/winBuild/Alif.sln b/winBuild/Alif.sln
@@ -3,16 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34009.444
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AlifCore", "AlifCore.vcxproj", "{374B810E-2C2F-4512-AED8-A5A115B6DC09}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{776C81C7-34B9-4940-85F8-EC256AF6567A}"
-	ProjectSection(SolutionItems) = preProject
-		..\.editorconfig = ..\.editorconfig
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alif", "Alif.vcxproj", "{6F25B086-E62D-482D-832F-C548413D585C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AlifMain", "AlifGeneral.vcxproj", "{8604DB0E-C2A6-49F6-BE9B-755878FDA8F8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AlifCore", "AlifGeneral.vcxproj", "{8604DB0E-C2A6-49F6-BE9B-755878FDA8F8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -22,14 +17,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{374B810E-2C2F-4512-AED8-A5A115B6DC09}.Debug|x64.ActiveCfg = Debug|x64
-		{374B810E-2C2F-4512-AED8-A5A115B6DC09}.Debug|x64.Build.0 = Debug|x64
-		{374B810E-2C2F-4512-AED8-A5A115B6DC09}.Debug|x86.ActiveCfg = Debug|Win32
-		{374B810E-2C2F-4512-AED8-A5A115B6DC09}.Debug|x86.Build.0 = Debug|Win32
-		{374B810E-2C2F-4512-AED8-A5A115B6DC09}.Release|x64.ActiveCfg = Release|x64
-		{374B810E-2C2F-4512-AED8-A5A115B6DC09}.Release|x64.Build.0 = Release|x64
-		{374B810E-2C2F-4512-AED8-A5A115B6DC09}.Release|x86.ActiveCfg = Release|Win32
-		{374B810E-2C2F-4512-AED8-A5A115B6DC09}.Release|x86.Build.0 = Release|Win32
 		{6F25B086-E62D-482D-832F-C548413D585C}.Debug|x64.ActiveCfg = Debug|x64
 		{6F25B086-E62D-482D-832F-C548413D585C}.Debug|x64.Build.0 = Debug|x64
 		{6F25B086-E62D-482D-832F-C548413D585C}.Debug|x86.ActiveCfg = Debug|Win32

diff --git a/winBuild/Alif.vcxproj b/winBuild/Alif.vcxproj
@@ -96,7 +96,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp20</LanguageStandard>
-      <AdditionalIncludeDirectories>..\source\Alif;..\source\Include\Main;..\source\Include\Core;C:\Users\PC-1\Documents\GitHub\Alif\source\Alif</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\source\Alif;..\source\AlifCore\Include\Main;..\source\AlifCore\Include\Core</AdditionalIncludeDirectories>
       <ProgramDataBaseFileName>$(IntDir)vc$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
@@ -112,7 +112,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\source\Alif;..\source\Include\Main;..\source\Include\Core;C:\Users\PC-1\Documents\GitHub\Alif\source\Alif</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\source\Alif;..\source\AlifCore\Include\Main;..\source\AlifCore\Include\Core</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <ProgramDataBaseFileName>$(IntDir)vc$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
     </ClCompile>
@@ -129,7 +129,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\source\Alif;..\source\Include\Main;..\source\Include\Core;C:\Users\PC-1\Documents\GitHub\Alif\source\Alif</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\source\Alif;..\source\AlifCore\Include\Main;..\source\AlifCore\Include\Core</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <ProgramDataBaseFileName>$(IntDir)vc$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
     </ClCompile>
@@ -146,7 +146,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\source\Alif;..\source\Include\Main;..\source\Include\Core;C:\Users\PC-1\Documents\GitHub\Alif\source\Alif</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\source\Alif;..\source\AlifCore\Include\Main;..\source\AlifCore\Include\Core</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <ProgramDataBaseFileName>$(IntDir)vc$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
     </ClCompile>
@@ -168,13 +168,13 @@
     <ClCompile Include="..\source\Alif\alif.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="AlifCore.vcxproj">
-      <Project>{374b810e-2c2f-4512-aed8-a5a115b6dc09}</Project>
-    </ProjectReference>
     <ProjectReference Include="AlifGeneral.vcxproj">
       <Project>{8604db0e-c2a6-49f6-be9b-755878fda8f8}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\.editorconfig" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/winBuild/Alif.vcxproj.filters b/winBuild/Alif.vcxproj.filters
@@ -5,22 +5,18 @@
       <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
       <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
     <Filter Include="Resource Files">
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\source\Alif\alif.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\resources\win\resource.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\source\Alif\alif.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\resources\win\Alif5.rc">
@@ -32,4 +28,7 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\.editorconfig" />
+  </ItemGroup>
 </Project>
diff --git a/winBuild/AlifCore.vcxproj b/winBuild/AlifCore.vcxproj
@@ -18,66 +18,13 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Abstract.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_AlifCycle.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_AlifEval.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_AlifRun.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_AlifState.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_AlifThread.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_AlifToken.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_ASDL.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_AST.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Backoff.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_BytesMethods.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_BytesObject.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Call.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Code.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Compile.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_CondVar.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Context.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Dict.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_DureRun.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_DureRunInit.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_FileUtils.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_FlowGraph.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Frame.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_FreeList.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Function.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_GC.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_GetConsoleLine.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_GlobalLock.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_GlobalObjects.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_GlobalString.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_HashArrayMapTree.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Import.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_InitConfig.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_InstructionSeq.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Integer.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Interpreter.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Intrinsics.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_List.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_LList.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Lock.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Memory.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_ModSupport.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_ModuleObject.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Object.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_ObjectState.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_OpCodeData.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_OpCodeUtils.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_SymTable.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Time.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_Tuple.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_TypeObject.h" />
-    <ClInclude Include="..\source\Include\Core\AlifCore_UString.h" />
-  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{374b810e-2c2f-4512-aed8-a5a115b6dc09}</ProjectGuid>
     <RootNamespace>AlifCore</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>Includes</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/winBuild/AlifCore.vcxproj.filters b/winBuild/AlifCore.vcxproj.filters
@@ -1,166 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Core Files">
-      <UniqueIdentifier>{22590bc6-b02a-485c-b081-0a8c0d8dcd71}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\source\Include\Core\AlifCore_AlifCycle.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_GetConsoleLine.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_InitConfig.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Memory.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_AlifRun.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_AST.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_ASDL.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_BytesMethods.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_BytesObject.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Call.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Dict.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Integer.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_List.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_ModSupport.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Object.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Tuple.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_TypeObject.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_UString.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_AlifToken.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_FileUtils.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_AlifThread.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_LList.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Time.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_DureRun.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_DureRunInit.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_CondVar.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_GlobalLock.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Lock.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_AlifState.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Interpreter.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Import.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Code.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Compile.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_FlowGraph.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_GC.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_GlobalString.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_InstructionSeq.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Intrinsics.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_OpCodeData.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_OpCodeUtils.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_SymTable.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Frame.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_AlifEval.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Function.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_GlobalObjects.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_HashArrayMapTree.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Context.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_FreeList.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_ObjectState.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Abstract.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_ModuleObject.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\Include\Core\AlifCore_Backoff.h">
-      <Filter>Header Core Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />