diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2a8844e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*~
+build/*
diff --git a/josm-todo/GPL-v2.0.txt b/GPL-v2.0.txt
similarity index 100%
rename from josm-todo/GPL-v2.0.txt
rename to GPL-v2.0.txt
diff --git a/josm-todo/GPL-v3.0.txt b/GPL-v3.0.txt
similarity index 100%
rename from josm-todo/GPL-v3.0.txt
rename to GPL-v3.0.txt
diff --git a/josm-todo/README b/README
similarity index 100%
rename from josm-todo/README
rename to README
diff --git a/josm-todo/build.xml b/build.xml
similarity index 98%
rename from josm-todo/build.xml
rename to build.xml
index e0cae03..cd72386 100644
--- a/josm-todo/build.xml
+++ b/build.xml
@@ -38,7 +38,7 @@
     <property name="plugin.src.dir" value="src"/>
     <!-- this is the directory where the plugin jar is copied to -->
     <property name="plugin.dist.dir" value="../../dist"/>
-    <property name="ant.build.javac.target" value="1.5"/>
+    <property name="ant.build.javac.target" value="1.7"/>
     <property name="plugin.dist.dir" value="../../dist"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
     <!--
@@ -56,7 +56,7 @@
     -->
     <target name="compile" depends="init">
         <echo message="compiling sources for  ${plugin.jar} ... "/>
-        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
+        <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
         </javac>
diff --git a/data/.gitkeep b/data/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/dist/todo.jar b/dist/todo.jar
deleted file mode 100644
index cc622e8..0000000
Binary files a/dist/todo.jar and /dev/null differ
diff --git a/josm-todo/images/dialogs/check.png b/images/dialogs/check.png
similarity index 100%
rename from josm-todo/images/dialogs/check.png
rename to images/dialogs/check.png
diff --git a/josm-todo/images/dialogs/todo.png b/images/dialogs/todo.png
similarity index 100%
rename from josm-todo/images/dialogs/todo.png
rename to images/dialogs/todo.png
diff --git a/resources/.gitkeep b/resources/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/josm-todo/src/org/openstreetmap/josm/plugins/todo/TodoDialog.java b/src/org/openstreetmap/josm/plugins/todo/TodoDialog.java
similarity index 100%
rename from josm-todo/src/org/openstreetmap/josm/plugins/todo/TodoDialog.java
rename to src/org/openstreetmap/josm/plugins/todo/TodoDialog.java
diff --git a/josm-todo/src/org/openstreetmap/josm/plugins/todo/TodoListModel.java b/src/org/openstreetmap/josm/plugins/todo/TodoListModel.java
similarity index 100%
rename from josm-todo/src/org/openstreetmap/josm/plugins/todo/TodoListModel.java
rename to src/org/openstreetmap/josm/plugins/todo/TodoListModel.java
diff --git a/josm-todo/src/org/openstreetmap/josm/plugins/todo/TodoPlugin.java b/src/org/openstreetmap/josm/plugins/todo/TodoPlugin.java
similarity index 100%
rename from josm-todo/src/org/openstreetmap/josm/plugins/todo/TodoPlugin.java
rename to src/org/openstreetmap/josm/plugins/todo/TodoPlugin.java