diff --git a/Task A/.classpath b/Task_A/.classpath
similarity index 100%
rename from Task A/.classpath
rename to Task_A/.classpath
diff --git a/Task B/.project b/Task_A/.project
old mode 100755
new mode 100644
similarity index 92%
rename from Task B/.project
rename to Task_A/.project
index bb8e88589f8c1d86cdba8c26259d62b831fb3586..0df4c5fa2d03ceedef43b1a12b23a95957de06da
--- a/Task B/.project	
+++ b/Task_A/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ConfigReader</name>
+	<name>Task_A</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/Task A/bin/.gitignore b/Task_A/bin/.gitignore
similarity index 100%
rename from Task A/bin/.gitignore
rename to Task_A/bin/.gitignore
diff --git a/Task A/projects.dtd b/Task_A/projects.dtd
similarity index 100%
rename from Task A/projects.dtd
rename to Task_A/projects.dtd
diff --git a/Task A/projects.xml b/Task_A/projects.xml
similarity index 100%
rename from Task A/projects.xml
rename to Task_A/projects.xml
diff --git a/Task A/src/builder/AbstractConverter.java b/Task_A/src/builder/AbstractConverter.java
similarity index 100%
rename from Task A/src/builder/AbstractConverter.java
rename to Task_A/src/builder/AbstractConverter.java
diff --git a/Task A/src/builder/DOMNodes.java b/Task_A/src/builder/DOMNodes.java
similarity index 100%
rename from Task A/src/builder/DOMNodes.java
rename to Task_A/src/builder/DOMNodes.java
diff --git a/Task A/src/builder/DocReader.java b/Task_A/src/builder/DocReader.java
similarity index 100%
rename from Task A/src/builder/DocReader.java
rename to Task_A/src/builder/DocReader.java
diff --git a/Task A/src/builder/EmailListConverter.java b/Task_A/src/builder/EmailListConverter.java
similarity index 100%
rename from Task A/src/builder/EmailListConverter.java
rename to Task_A/src/builder/EmailListConverter.java
diff --git a/Task A/src/builder/NodeConverter.java b/Task_A/src/builder/NodeConverter.java
similarity index 100%
rename from Task A/src/builder/NodeConverter.java
rename to Task_A/src/builder/NodeConverter.java
diff --git a/Task A/src/builder/ParseTest.java b/Task_A/src/builder/ParseTest.java
similarity index 100%
rename from Task A/src/builder/ParseTest.java
rename to Task_A/src/builder/ParseTest.java
diff --git a/Task A/src/builder/SupervisorConverter.java b/Task_A/src/builder/SupervisorConverter.java
similarity index 100%
rename from Task A/src/builder/SupervisorConverter.java
rename to Task_A/src/builder/SupervisorConverter.java
diff --git a/Task A/src/state/GumballMachine.java b/Task_A/src/state/GumballMachine.java
similarity index 100%
rename from Task A/src/state/GumballMachine.java
rename to Task_A/src/state/GumballMachine.java
diff --git a/Task A/src/state/GumballMachineTestDrive.java b/Task_A/src/state/GumballMachineTestDrive.java
similarity index 100%
rename from Task A/src/state/GumballMachineTestDrive.java
rename to Task_A/src/state/GumballMachineTestDrive.java
diff --git a/Task A/src/state/NoQuarterState.java b/Task_A/src/state/NoQuarterState.java
similarity index 100%
rename from Task A/src/state/NoQuarterState.java
rename to Task_A/src/state/NoQuarterState.java
diff --git a/Task A/src/state/State.java b/Task_A/src/state/State.java
similarity index 100%
rename from Task A/src/state/State.java
rename to Task_A/src/state/State.java
diff --git a/Task B/.classpath b/Task_B/.classpath
similarity index 100%
rename from Task B/.classpath
rename to Task_B/.classpath
diff --git a/Task A/.project b/Task_B/.project
old mode 100644
new mode 100755
similarity index 92%
rename from Task A/.project
rename to Task_B/.project
index 9c8d33428b8a5d03df44a52b60b2dec1f4ee7f78..55df143b62e9d9c12c4b58a4c432734b065cdebd
--- a/Task A/.project	
+++ b/Task_B/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Builder_State</name>
+	<name>Task_B</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/Task B/bin/.gitignore b/Task_B/bin/.gitignore
similarity index 100%
rename from Task B/bin/.gitignore
rename to Task_B/bin/.gitignore
diff --git a/Task B/build.xml b/Task_B/build.xml
similarity index 100%
rename from Task B/build.xml
rename to Task_B/build.xml
diff --git a/Task B/build.yaml b/Task_B/build.yaml
similarity index 100%
rename from Task B/build.yaml
rename to Task_B/build.yaml
diff --git a/Task B/lib/yamlbeans-1.0.jar b/Task_B/lib/yamlbeans-1.0.jar
similarity index 100%
rename from Task B/lib/yamlbeans-1.0.jar
rename to Task_B/lib/yamlbeans-1.0.jar
diff --git a/Task B/src/domain/BuildConfig.java b/Task_B/src/domain/BuildConfig.java
similarity index 100%
rename from Task B/src/domain/BuildConfig.java
rename to Task_B/src/domain/BuildConfig.java
diff --git a/Task B/src/domain/Project.java b/Task_B/src/domain/Project.java
similarity index 100%
rename from Task B/src/domain/Project.java
rename to Task_B/src/domain/Project.java
diff --git a/Task B/src/domain/Property.java b/Task_B/src/domain/Property.java
similarity index 100%
rename from Task B/src/domain/Property.java
rename to Task_B/src/domain/Property.java
diff --git a/Task B/src/domain/Target.java b/Task_B/src/domain/Target.java
similarity index 100%
rename from Task B/src/domain/Target.java
rename to Task_B/src/domain/Target.java
diff --git a/Task B/src/main/Main.java b/Task_B/src/main/Main.java
similarity index 100%
rename from Task B/src/main/Main.java
rename to Task_B/src/main/Main.java
diff --git a/Task B/src/xml/Build.java b/Task_B/src/xml/Build.java
similarity index 100%
rename from Task B/src/xml/Build.java
rename to Task_B/src/xml/Build.java
diff --git a/Task B/src/xml/XMLBuildConfigurationReader.java b/Task_B/src/xml/XMLBuildConfigurationReader.java
similarity index 100%
rename from Task B/src/xml/XMLBuildConfigurationReader.java
rename to Task_B/src/xml/XMLBuildConfigurationReader.java
diff --git a/Task B/src/yaml/Compile.java b/Task_B/src/yaml/Compile.java
similarity index 100%
rename from Task B/src/yaml/Compile.java
rename to Task_B/src/yaml/Compile.java
diff --git a/Task B/src/yaml/YamlBuildConfigurationReader.java b/Task_B/src/yaml/YamlBuildConfigurationReader.java
similarity index 100%
rename from Task B/src/yaml/YamlBuildConfigurationReader.java
rename to Task_B/src/yaml/YamlBuildConfigurationReader.java
diff --git a/Task B/test/src/xml/XMLBuildConfigurationReaderTest.java b/Task_B/test/src/xml/XMLBuildConfigurationReaderTest.java
similarity index 100%
rename from Task B/test/src/xml/XMLBuildConfigurationReaderTest.java
rename to Task_B/test/src/xml/XMLBuildConfigurationReaderTest.java
diff --git a/Task B/test/src/xml/YamlBuildConfigurationReaderTest.java b/Task_B/test/src/xml/YamlBuildConfigurationReaderTest.java
similarity index 100%
rename from Task B/test/src/xml/YamlBuildConfigurationReaderTest.java
rename to Task_B/test/src/xml/YamlBuildConfigurationReaderTest.java
diff --git a/Task C/.classpath b/Task_C/.classpath
similarity index 100%
rename from Task C/.classpath
rename to Task_C/.classpath
diff --git a/Task C/.project b/Task_C/.project
similarity index 91%
rename from Task C/.project
rename to Task_C/.project
index ca1325b364daa057d2f8577303318258400837f4..f33adcabbd3c454c1f917cc5323669a3bccf0543 100755
--- a/Task C/.project	
+++ b/Task_C/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Visitor_Interpreter</name>
+	<name>Task_C</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/Task C/bin/visitor/overview.png b/Task_C/bin/visitor/overview.png
similarity index 100%
rename from Task C/bin/visitor/overview.png
rename to Task_C/bin/visitor/overview.png
diff --git a/Task C/src/interpreter/lisp/BinaryExpression.java b/Task_C/src/interpreter/lisp/BinaryExpression.java
similarity index 100%
rename from Task C/src/interpreter/lisp/BinaryExpression.java
rename to Task_C/src/interpreter/lisp/BinaryExpression.java
diff --git a/Task C/src/interpreter/lisp/CompoundExpression.java b/Task_C/src/interpreter/lisp/CompoundExpression.java
similarity index 100%
rename from Task C/src/interpreter/lisp/CompoundExpression.java
rename to Task_C/src/interpreter/lisp/CompoundExpression.java
diff --git a/Task C/src/interpreter/lisp/CompoundFunction.java b/Task_C/src/interpreter/lisp/CompoundFunction.java
similarity index 100%
rename from Task C/src/interpreter/lisp/CompoundFunction.java
rename to Task_C/src/interpreter/lisp/CompoundFunction.java
diff --git a/Task C/src/interpreter/lisp/Conditional.java b/Task_C/src/interpreter/lisp/Conditional.java
similarity index 100%
rename from Task C/src/interpreter/lisp/Conditional.java
rename to Task_C/src/interpreter/lisp/Conditional.java
diff --git a/Task C/src/interpreter/lisp/Constants.java b/Task_C/src/interpreter/lisp/Constants.java
similarity index 100%
rename from Task C/src/interpreter/lisp/Constants.java
rename to Task_C/src/interpreter/lisp/Constants.java
diff --git a/Task C/src/interpreter/lisp/Context.java b/Task_C/src/interpreter/lisp/Context.java
similarity index 100%
rename from Task C/src/interpreter/lisp/Context.java
rename to Task_C/src/interpreter/lisp/Context.java
diff --git a/Task C/src/interpreter/lisp/Eq.java b/Task_C/src/interpreter/lisp/Eq.java
similarity index 100%
rename from Task C/src/interpreter/lisp/Eq.java
rename to Task_C/src/interpreter/lisp/Eq.java
diff --git a/Task C/src/interpreter/lisp/Expr.java b/Task_C/src/interpreter/lisp/Expr.java
similarity index 100%
rename from Task C/src/interpreter/lisp/Expr.java
rename to Task_C/src/interpreter/lisp/Expr.java
diff --git a/Task C/src/interpreter/lisp/Fun.java b/Task_C/src/interpreter/lisp/Fun.java
similarity index 100%
rename from Task C/src/interpreter/lisp/Fun.java
rename to Task_C/src/interpreter/lisp/Fun.java
diff --git a/Task C/src/interpreter/lisp/FunctionCall.java b/Task_C/src/interpreter/lisp/FunctionCall.java
similarity index 100%
rename from Task C/src/interpreter/lisp/FunctionCall.java
rename to Task_C/src/interpreter/lisp/FunctionCall.java
diff --git a/Task C/src/interpreter/lisp/InterpreterTest.java b/Task_C/src/interpreter/lisp/InterpreterTest.java
similarity index 100%
rename from Task C/src/interpreter/lisp/InterpreterTest.java
rename to Task_C/src/interpreter/lisp/InterpreterTest.java
diff --git a/Task C/src/interpreter/lisp/Mult.java b/Task_C/src/interpreter/lisp/Mult.java
similarity index 100%
rename from Task C/src/interpreter/lisp/Mult.java
rename to Task_C/src/interpreter/lisp/Mult.java
diff --git a/Task C/src/interpreter/lisp/Num.java b/Task_C/src/interpreter/lisp/Num.java
similarity index 100%
rename from Task C/src/interpreter/lisp/Num.java
rename to Task_C/src/interpreter/lisp/Num.java
diff --git a/Task C/src/interpreter/lisp/Reader.java b/Task_C/src/interpreter/lisp/Reader.java
similarity index 100%
rename from Task C/src/interpreter/lisp/Reader.java
rename to Task_C/src/interpreter/lisp/Reader.java
diff --git a/Task C/src/interpreter/lisp/Sub.java b/Task_C/src/interpreter/lisp/Sub.java
similarity index 100%
rename from Task C/src/interpreter/lisp/Sub.java
rename to Task_C/src/interpreter/lisp/Sub.java
diff --git a/Task C/src/interpreter/lisp/Symbol.java b/Task_C/src/interpreter/lisp/Symbol.java
similarity index 100%
rename from Task C/src/interpreter/lisp/Symbol.java
rename to Task_C/src/interpreter/lisp/Symbol.java
diff --git a/Task C/src/interpreter/lisp/test/AllTests.java b/Task_C/src/interpreter/lisp/test/AllTests.java
similarity index 100%
rename from Task C/src/interpreter/lisp/test/AllTests.java
rename to Task_C/src/interpreter/lisp/test/AllTests.java
diff --git a/Task C/src/interpreter/lisp/test/CompoundExpressionTest.java b/Task_C/src/interpreter/lisp/test/CompoundExpressionTest.java
similarity index 100%
rename from Task C/src/interpreter/lisp/test/CompoundExpressionTest.java
rename to Task_C/src/interpreter/lisp/test/CompoundExpressionTest.java
diff --git a/Task C/src/interpreter/lisp/test/ReaderTest.java b/Task_C/src/interpreter/lisp/test/ReaderTest.java
similarity index 100%
rename from Task C/src/interpreter/lisp/test/ReaderTest.java
rename to Task_C/src/interpreter/lisp/test/ReaderTest.java
diff --git a/Task C/src/polymorphism/ABaseClass.java b/Task_C/src/polymorphism/ABaseClass.java
similarity index 100%
rename from Task C/src/polymorphism/ABaseClass.java
rename to Task_C/src/polymorphism/ABaseClass.java
diff --git a/Task C/src/polymorphism/ASubClass.java b/Task_C/src/polymorphism/ASubClass.java
similarity index 100%
rename from Task C/src/polymorphism/ASubClass.java
rename to Task_C/src/polymorphism/ASubClass.java
diff --git a/Task C/src/polymorphism/PolymorphismTest.java b/Task_C/src/polymorphism/PolymorphismTest.java
similarity index 100%
rename from Task C/src/polymorphism/PolymorphismTest.java
rename to Task_C/src/polymorphism/PolymorphismTest.java
diff --git a/Task C/src/visitor/AbstractExpression.java b/Task_C/src/visitor/AbstractExpression.java
similarity index 100%
rename from Task C/src/visitor/AbstractExpression.java
rename to Task_C/src/visitor/AbstractExpression.java
diff --git a/Task C/src/visitor/CompoundExpression.java b/Task_C/src/visitor/CompoundExpression.java
similarity index 100%
rename from Task C/src/visitor/CompoundExpression.java
rename to Task_C/src/visitor/CompoundExpression.java
diff --git a/Task C/src/visitor/CountingVariablesVisitor.java b/Task_C/src/visitor/CountingVariablesVisitor.java
similarity index 100%
rename from Task C/src/visitor/CountingVariablesVisitor.java
rename to Task_C/src/visitor/CountingVariablesVisitor.java
diff --git a/Task C/src/visitor/EvaluationVisitor.java b/Task_C/src/visitor/EvaluationVisitor.java
similarity index 100%
rename from Task C/src/visitor/EvaluationVisitor.java
rename to Task_C/src/visitor/EvaluationVisitor.java
diff --git a/Task C/src/visitor/ExpressionTest.java b/Task_C/src/visitor/ExpressionTest.java
similarity index 100%
rename from Task C/src/visitor/ExpressionTest.java
rename to Task_C/src/visitor/ExpressionTest.java
diff --git a/Task C/src/visitor/Minus.java b/Task_C/src/visitor/Minus.java
similarity index 100%
rename from Task C/src/visitor/Minus.java
rename to Task_C/src/visitor/Minus.java
diff --git a/Task C/src/visitor/Number.java b/Task_C/src/visitor/Number.java
similarity index 100%
rename from Task C/src/visitor/Number.java
rename to Task_C/src/visitor/Number.java
diff --git a/Task C/src/visitor/PrintVisitor.java b/Task_C/src/visitor/PrintVisitor.java
similarity index 100%
rename from Task C/src/visitor/PrintVisitor.java
rename to Task_C/src/visitor/PrintVisitor.java
diff --git a/Task C/src/visitor/SimpleExpression.java b/Task_C/src/visitor/SimpleExpression.java
similarity index 100%
rename from Task C/src/visitor/SimpleExpression.java
rename to Task_C/src/visitor/SimpleExpression.java
diff --git a/Task C/src/visitor/Sum.java b/Task_C/src/visitor/Sum.java
similarity index 100%
rename from Task C/src/visitor/Sum.java
rename to Task_C/src/visitor/Sum.java
diff --git a/Task C/src/visitor/Variable.java b/Task_C/src/visitor/Variable.java
similarity index 100%
rename from Task C/src/visitor/Variable.java
rename to Task_C/src/visitor/Variable.java
diff --git a/Task C/src/visitor/Visitor.java b/Task_C/src/visitor/Visitor.java
similarity index 100%
rename from Task C/src/visitor/Visitor.java
rename to Task_C/src/visitor/Visitor.java
diff --git a/Task C/src/visitor/VisitorTest.java b/Task_C/src/visitor/VisitorTest.java
similarity index 100%
rename from Task C/src/visitor/VisitorTest.java
rename to Task_C/src/visitor/VisitorTest.java
diff --git a/Task C/src/visitor/overview.png b/Task_C/src/visitor/overview.png
similarity index 100%
rename from Task C/src/visitor/overview.png
rename to Task_C/src/visitor/overview.png
diff --git a/Task C/src/visitor/overview.ucls b/Task_C/src/visitor/overview.ucls
similarity index 100%
rename from Task C/src/visitor/overview.ucls
rename to Task_C/src/visitor/overview.ucls