diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000000000000000000000000000000000..8578320d5328c6cc062484000e5d433318f9b476
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,57 @@
+# Handle line endings automatically for files detected as text
+# and leave all files detected as binary untouched.
+* text=auto
+
+#
+# The above will handle all files NOT found below
+#
+# These files are text and should be normalized (Convert crlf => lf)
+*.cl            text
+*.classpath     text
+*.css           text
+*.csv           text
+*.df            text
+*.fxbuild       text
+*.fxml          text
+*.gml           text
+*.htm           text
+*.html          text
+*.insel         text
+*.java          text diff=java
+*.js            text
+*.json          text
+*.jsp           text
+*.jspf          text
+*.jspx          text
+*.kml           text
+*.prn           text
+*.project       text
+*.properties    text
+*.sh            text
+*.tld           text
+*.txt           text
+*.tag           text
+*.tagx          text
+*.xml           text
+*.xsd           text
+*.xsl           text
+*.yml           text
+
+# These files are binary and should be left untouched
+# (binary is a macro for -text -diff)
+*.class         binary
+*.dll           binary
+*.ear           binary
+*.gif           binary
+*.ico           binary
+*.jar           binary
+*.jpg           binary
+*.jpeg          binary
+*.pdf           binary diff=astextplain
+*.png           binary
+*.rtf           binary diff=astextplain
+*.so            binary
+*.tiff          binary
+*.tmy3          binary
+*.xslsx         binary
+*.war           binary
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..f2ac2a5e99e372d50026d34a08b1ac1e56d6442c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+bin/
+/tmpdeploy/
+/SimStadtTestReports/
diff --git a/deploy-common.xml b/deploy-common.xml
index 8fe824087c3e261fa7381c769f5168d0ad49182b..e65c654df02b66da0ddeaad3f6e4e7bc6fe71ea7 100644
--- a/deploy-common.xml
+++ b/deploy-common.xml
@@ -39,7 +39,7 @@ Note also that this script requires Ant version 1.9.4 or higher.
 	<!-- <property name="doNotTest" value="true"/> Uncomment in order to disable tests, reports and coverage reports -->
 
 	<taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
-		<classpath path="SimStadt/lib/test/jacocoant.jar" />
+		<classpath path="RegionChooser/lib/test/jacocoant.jar" />
 	</taskdef>
 
 	<path id="classpath">
diff --git a/deploy.xml b/deploy.xml
index b80a134aa037e8fd24ca027778e47f768e30b2d6..ebdc81a187ddb396172ea9f93dc6fe6c17bf597d 100644
--- a/deploy.xml
+++ b/deploy.xml
@@ -5,12 +5,12 @@ to the directory specified in property "deploy.dir.path". It can be used to perf
 Before executing check that all required modules/projects are enumerated in  property "projects".
 -->
 
-<project default="deploy" name="RegionChooser" basedir="..">
+<project default="deploy" name="RegionChooser" basedir=".">
 	<description>
 		Create a Jar file with RegionChooser libraries and executables
 	</description>
 	<property name="target.path" value="lib/region-chooser" />
-	<property name="projects" value="RegionChooser" />
+	<property name="projects" value="." />
 	<import file="deploy-common.xml" />
 	<target name="deploy" depends="unit-test">
 		<echo file="${deploy.dir}/RegionChooser.bat">