diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fcc6dcc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+src-gen/
+xtend-gen/
+bin/
+plugin.xml_gen
+.antlr-generator-3.2.0.jar
diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index 4cae12b..0000000
--- a/.hgignore
+++ /dev/null
@@ -1,14 +0,0 @@
-syntax:glob
-.metadata
-.settings
-csep*/bin
-csep*/src-gen
-csep*/xtend-gen
-csep*/plugin.xml_gen
-org.eclipse.xtext.example.*
-org.xtext.example.*
-*.swp
-devel
-devel.*
-out
-csep.update/**.jar
diff --git a/.hgtags b/.hgtags
deleted file mode 100644
index c63dfb7..0000000
--- a/.hgtags
+++ /dev/null
@@ -1,11 +0,0 @@
-9299bb0f5fd036890ae80c396516d8bb0b87306c 0.0.3
-9299bb0f5fd036890ae80c396516d8bb0b87306c 0.0.3
-0000000000000000000000000000000000000000 0.0.3
-bc057684b6210fa69a7bbe6b06f1d1b863983f18 0.0.1
-efd23e143cbe9fd7c847d2915990dd107c382f94 0.0.2
-0000000000000000000000000000000000000000 0.0.3
-c5f6bbacbfbd7053d1a23c1ebc288ee4dcb0da09 0.0.3
-8591acf070841306da6dfc1cb0a4c8fa7ab3303d 0.1.0
-b816b56aad8a7d6b9a3e3563916284d9f2731f93 0.2.0
-cbb12369f8a024eb188dc41bfe47c00fdb4da11c 0.2.1
-c90b1aad6ce6ea39e4ffa7f6a7bb87d420d901f9 0.2.2
diff --git a/README.md b/README.md
index b610f4e..e91e653 100644
--- a/README.md
+++ b/README.md
@@ -106,3 +106,16 @@ You may be [given a warning](https://bitbucket.org/adamschmideg/coffeescript-ecl
   [xtext_download]: http://www.eclipse.org/Xtext/download.html
   [csep_bitbucket_download]: https://bitbucket.org/adamschmideg/coffeescript-eclipse/downloads
   [csep_github]: https://github.com/adamschmideg/coffeescript-eclipse 
+
+
+# Building
+
+If you want to contribute to the plugin, here's a quick overview how to setup and build it locally:
+
+1. Install [http://www.eclipse.org/Xtext/download.html](Xtext) / Version 2.1.x
+2. Clone this repository
+3. Import all projects into your workspace
+4. Right click `csep/src/csep/CoffeeScript.xtext/CoffeeScript.xtext` -> Run as ... -> Generate Xtext language artifacts
+5. Right click `example/csep.example.cake/src/csep/example/cake/Cakefile.xtext` -> Run as .. -> Generate Xtext language artifacts
+
+After these 5 steps, the project should build without errors and you can startup a new eclipse instance and open any .coffee file using the coffeescript editor.
diff --git a/csep.tests/META-INF/MANIFEST.MF b/csep.tests/META-INF/MANIFEST.MF
index 581278f..88f3cdc 100644
--- a/csep.tests/META-INF/MANIFEST.MF
+++ b/csep.tests/META-INF/MANIFEST.MF
@@ -1,21 +1,28 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.2.2
-Bundle-SymbolicName: csep.tests; singleton:=true
-Bundle-ActivationPolicy: lazy
-Require-Bundle: csep,
- csep.ui,
- org.eclipse.core.runtime,
- org.eclipse.xtext,
- org.eclipse.xtext.junit4,
- org.eclipse.xtext.ui.junit,
- org.junit4,
- org.eclipse.ui.workbench;bundle-version="3.5.2";resolution:=optional,
- org.eclipse.xtext.common.types;bundle-version="2.0.0",
- org.eclipse.xtext.xbase.junit;bundle-version="2.0.0",
- org.eclipse.xtext.xbase;bundle-version="2.0.0"
-Import-Package: org.apache.commons.logging,
- org.apache.log4j
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Version: 0.2.2
+Bundle-SymbolicName: csep.tests; singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: csep,
+ csep.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.xtext,
+ org.eclipse.xtext.junit4,
+ org.eclipse.xtext.ui.junit,
+ org.junit4,
+ org.eclipse.ui.workbench;bundle-version="3.5.2";resolution:=optional,
+ org.eclipse.xtext.common.types;bundle-version="2.0.0",
+ org.eclipse.xtext.xbase.junit;bundle-version="2.0.0",
+ org.eclipse.xtext.xbase;bundle-version="2.0.0"
+Import-Package: org.apache.commons.logging,
+ org.apache.log4j,
+ org.junit.runner;version="4.5.0",
+ org.junit.runner.manipulation;version="4.5.0",
+ org.junit.runner.notification;version="4.5.0",
+ org.junit.runners;version="4.5.0",
+ org.junit.runners.model;version="4.5.0",
+ org.hamcrest.core
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: csep
diff --git a/csep/META-INF/MANIFEST.MF b/csep/META-INF/MANIFEST.MF
index 514962a..490e381 100644
--- a/csep/META-INF/MANIFEST.MF
+++ b/csep/META-INF/MANIFEST.MF
@@ -18,13 +18,11 @@ Require-Bundle: org.apache.log4j;bundle-version="1.2.15";visibility:=reexport,
  org.eclipse.xtext.xbase;bundle-version="2.0.0",
  org.eclipse.xtext.common.types,
  org.eclipse.xtext.xbase.lib;bundle-version="2.0.0";visibility:=reexport,
- org.eclipse.xtext.xtend2.lib;bundle-version="2.0.0";visibility:=reexport,
  org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional;visibility:=reexport,
  org.eclipse.xtext.ui.codetemplates;bundle-version="2.0.0"
-Import-Package: org.apache.log4j,
- org.apache.commons.logging,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtext.xtend2.lib
+Import-Package: org.apache.commons.logging,
+ org.apache.log4j,
+ org.eclipse.xtext.xbase.lib
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: beaver,
  com.aptana.editor.coffee.parsing,
diff --git a/example/csep.example.cake.tests/META-INF/MANIFEST.MF b/example/csep.example.cake.tests/META-INF/MANIFEST.MF
index fac862f..86dea8e 100644
--- a/example/csep.example.cake.tests/META-INF/MANIFEST.MF
+++ b/example/csep.example.cake.tests/META-INF/MANIFEST.MF
@@ -1,18 +1,25 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: csep.example.cake.tests
-Bundle-Vendor: My Company
-Bundle-Version: 1.0.0
-Bundle-SymbolicName: csep.example.cake.tests; singleton:=true
-Bundle-ActivationPolicy: lazy
-Require-Bundle: csep.example.cake,
- csep.example.cake.ui,
- org.eclipse.core.runtime,
- org.eclipse.xtext,
- org.eclipse.xtext.junit4,
- org.eclipse.xtext.ui.junit,
- org.junit4,
- org.eclipse.ui.workbench;resolution:=optional
-Import-Package: org.apache.log4j,
- org.apache.commons.logging
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: csep.example.cake.tests
+Bundle-Vendor: My Company
+Bundle-Version: 1.0.0
+Bundle-SymbolicName: csep.example.cake.tests; singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: csep.example.cake,
+ csep.example.cake.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.xtext,
+ org.eclipse.xtext.junit4,
+ org.eclipse.xtext.ui.junit,
+ org.junit4,
+ org.eclipse.ui.workbench;resolution:=optional
+Import-Package: org.apache.log4j,
+ org.apache.commons.logging,
+ org.junit.runner;version="4.5.0",
+ org.junit.runner.manipulation;version="4.5.0",
+ org.junit.runner.notification;version="4.5.0",
+ org.junit.runners;version="4.5.0",
+ org.junit.runners.model;version="4.5.0",
+ org.hamcrest.core
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: csep.example.cake
diff --git a/example/csep.example.cake.ui/META-INF/MANIFEST.MF b/example/csep.example.cake.ui/META-INF/MANIFEST.MF
index 7301f6b..d159126 100644
--- a/example/csep.example.cake.ui/META-INF/MANIFEST.MF
+++ b/example/csep.example.cake.ui/META-INF/MANIFEST.MF
@@ -20,5 +20,7 @@ Import-Package: org.apache.log4j,
  org.apache.commons.logging
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: csep.example.cake.ui.contentassist.antlr,
- csep.example.cake.ui.internal
+ csep.example.cake.ui.internal,
+ csep.example.cake.ui.quickfix,
+ csep.example.cake.ui.contentassist
 Bundle-Activator: csep.example.cake.ui.internal.CakefileActivator
diff --git a/example/csep.example.cake/META-INF/MANIFEST.MF b/example/csep.example.cake/META-INF/MANIFEST.MF
index b6d8941..935c255 100644
--- a/example/csep.example.cake/META-INF/MANIFEST.MF
+++ b/example/csep.example.cake/META-INF/MANIFEST.MF
@@ -24,8 +24,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.1.0";visibility:=reexport,
  csep.ui;bundle-version="0.2.1";visibility:=reexport
 Import-Package: org.apache.commons.logging,
  org.apache.log4j,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtext.xtend2.lib
+ org.eclipse.xtext.xbase.lib
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: csep.example.cake,
  csep.example.cake.services,
diff --git a/example/csep.example.cake/src/csep/example/cake/GenerateCakefile.mwe2 b/example/csep.example.cake/src/csep/example/cake/GenerateCakefile.mwe2
index 69fc2ae..532e9b4 100644
--- a/example/csep.example.cake/src/csep/example/cake/GenerateCakefile.mwe2
+++ b/example/csep.example.cake/src/csep/example/cake/GenerateCakefile.mwe2
@@ -14,7 +14,7 @@ Workflow {
         scanClassPath = true
         platformUri = "${runtimeProject}/.."    
         //registerGenModelFile = "platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel"
-        registerGenModelFile = "platform:/resource/csep/csep/CoffeeScript.genmodel"
+        registerGenModelFile = "platform:/resource/csep/src-gen/csep/CoffeeScript.genmodel"
     }
 
     component = DirectoryCleaner {