diff --git a/.gitignore b/.gitignore
index fcc6dcc..007a879 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ xtend-gen/
 bin/
 plugin.xml_gen
 .antlr-generator-3.2.0.jar
+target/
diff --git a/README.md b/README.md
index e91e653..a2173cb 100644
--- a/README.md
+++ b/README.md
@@ -110,6 +110,8 @@ You may be [given a warning](https://bitbucket.org/adamschmideg/coffeescript-ecl
 
 # Building
 
+## Building in eclipse
+
 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
@@ -119,3 +121,8 @@ If you want to contribute to the plugin, here's a quick overview how to setup an
 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.
+
+## Building with Maven / Tycho
+
+To start a headless build using maven, simply run `mvn` in the root of the project. 
+
diff --git a/csep.plugin/.project b/csep.feature/.project
similarity index 100%
rename from csep.plugin/.project
rename to csep.feature/.project
diff --git a/csep.plugin/build.properties b/csep.feature/build.properties
similarity index 100%
rename from csep.plugin/build.properties
rename to csep.feature/build.properties
diff --git a/csep.plugin/feature.xml b/csep.feature/feature.xml
similarity index 97%
rename from csep.plugin/feature.xml
rename to csep.feature/feature.xml
index bb470fe..3a2ea0b 100644
--- a/csep.plugin/feature.xml
+++ b/csep.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="csep.feature"
       label="Coffeescript Runtime and UI Features"
-      version="0.2.2.qualifier">
+      version="0.0.3.qualifier">
 
    <description url="https://bitbucket.org/adamschmideg/coffeescript-eclipse">
       Editor for Coffeescript code.
@@ -102,18 +102,23 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
    </license>
 
+   <requires>
+      <import plugin="org.eclipse.xtext" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.ui"/>
+   </requires>
+
    <plugin
          id="csep"
          download-size="1280"
          install-size="1280"
-         version="0.2.2"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="csep.ui"
-         download-size="250"
-         install-size="250"
-         version="0.2.2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>
diff --git a/csep.feature/pom.xml b/csep.feature/pom.xml
new file mode 100644
index 0000000..1c5b236
--- /dev/null
+++ b/csep.feature/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+      
+  <parent>
+    <groupId>csep</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.0.3-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>csep.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
+
diff --git a/csep.tests/META-INF/MANIFEST.MF b/csep.tests/META-INF/MANIFEST.MF
index 88f3cdc..2aefda7 100644
--- a/csep.tests/META-INF/MANIFEST.MF
+++ b/csep.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.2.2
+Bundle-Version: 0.0.3
 Bundle-SymbolicName: csep.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: csep,
diff --git a/csep.tests/pom.xml b/csep.tests/pom.xml
new file mode 100755
index 0000000..f891432
--- /dev/null
+++ b/csep.tests/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>csep</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.0.3</version>
+  </parent>
+
+  <artifactId>csep.tests</artifactId>
+  <packaging>eclipse-test-plugin</packaging>
+  
+  <properties>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <useUIHarness>false</useUIHarness>
+		  <useUIThread>false</useUIThread>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/csep.ui/META-INF/MANIFEST.MF b/csep.ui/META-INF/MANIFEST.MF
index b15b947..9b1dc3a 100644
--- a/csep.ui/META-INF/MANIFEST.MF
+++ b/csep.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.2.2
+Bundle-Version: 0.0.3.qualifier
 Bundle-SymbolicName: csep.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: csep;visibility:=reexport,
diff --git a/csep.ui/pom.xml b/csep.ui/pom.xml
new file mode 100644
index 0000000..69e8b1a
--- /dev/null
+++ b/csep.ui/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+      
+  <parent>
+    <groupId>csep</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.0.3-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>csep.ui</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+</project>
+
diff --git a/csep/META-INF/MANIFEST.MF b/csep/META-INF/MANIFEST.MF
index 490e381..42bb574 100644
--- a/csep/META-INF/MANIFEST.MF
+++ b/csep/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 0.2.2
+Bundle-Version: 0.0.3.qualifier
 Bundle-SymbolicName: csep; singleton:=true
 Require-Bundle: org.apache.log4j;bundle-version="1.2.15";visibility:=reexport,
  org.eclipse.xtext;bundle-version="2.0.0";visibility:=reexport,
diff --git a/csep/pom.xml b/csep/pom.xml
new file mode 100644
index 0000000..d7a248b
--- /dev/null
+++ b/csep/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+      
+  <parent>
+    <groupId>csep</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.0.3-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>csep</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+</project>
+
diff --git a/example/csep.example.cake/META-INF/MANIFEST.MF b/example/csep.example.cake/META-INF/MANIFEST.MF
index 935c255..65ccff9 100644
--- a/example/csep.example.cake/META-INF/MANIFEST.MF
+++ b/example/csep.example.cake/META-INF/MANIFEST.MF
@@ -20,8 +20,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.1.0";visibility:=reexport,
  org.eclipse.xtext.common.types,
  org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.100",
- csep;bundle-version="0.2.1";visibility:=reexport,
- csep.ui;bundle-version="0.2.1";visibility:=reexport
+ csep,
+ csep.ui
 Import-Package: org.apache.commons.logging,
  org.apache.log4j,
  org.eclipse.xtext.xbase.lib
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..f808b29
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>csep</groupId>
+  <artifactId>parent</artifactId>
+  <version>0.0.3-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>csep</module>
+    <module>csep.ui</module>
+    <module>csep.feature</module>
+  </modules>
+
+  <repositories>
+   <repository>
+     <id>kepler</id>
+     <layout>p2</layout>
+     <url>http://download.eclipse.org/releases/kepler</url>
+   </repository>	
+
+   <repository>
+     <id>xtext</id>
+     <layout>p2</layout>
+     <url>http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/</url>
+   </repository>  
+
+  </repositories>
+
+  <properties>
+    <tycho-version>0.17.0</tycho-version>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-maven-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <extensions>true</extensions>
+      </plugin>
+      <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-compiler-plugin</artifactId>
+          <version>${tycho-version}</version>
+          <configuration>
+              <source>1.6</source>
+              <target>1.6</target>
+          </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+
+</project>