diff --git a/autonature/_build/org.eclipse.statet.eutils.autonature-feature/.project b/autonature/_assemblies/org.eclipse.statet.eutils.autonature-feature/.project
similarity index 100%
rename from autonature/_build/org.eclipse.statet.eutils.autonature-feature/.project
rename to autonature/_assemblies/org.eclipse.statet.eutils.autonature-feature/.project
diff --git a/autonature/_build/org.eclipse.statet.eutils.autonature-feature/build.properties b/autonature/_assemblies/org.eclipse.statet.eutils.autonature-feature/build.properties
similarity index 100%
rename from autonature/_build/org.eclipse.statet.eutils.autonature-feature/build.properties
rename to autonature/_assemblies/org.eclipse.statet.eutils.autonature-feature/build.properties
diff --git a/autonature/_build/org.eclipse.statet.eutils.autonature-feature/feature.properties b/autonature/_assemblies/org.eclipse.statet.eutils.autonature-feature/feature.properties
similarity index 100%
rename from autonature/_build/org.eclipse.statet.eutils.autonature-feature/feature.properties
rename to autonature/_assemblies/org.eclipse.statet.eutils.autonature-feature/feature.properties
diff --git a/autonature/_build/org.eclipse.statet.eutils.autonature-feature/feature.xml b/autonature/_assemblies/org.eclipse.statet.eutils.autonature-feature/feature.xml
similarity index 84%
rename from autonature/_build/org.eclipse.statet.eutils.autonature-feature/feature.xml
rename to autonature/_assemblies/org.eclipse.statet.eutils.autonature-feature/feature.xml
index d3d7685..c3e14b6 100644
--- a/autonature/_build/org.eclipse.statet.eutils.autonature-feature/feature.xml
+++ b/autonature/_assemblies/org.eclipse.statet.eutils.autonature-feature/feature.xml
@@ -3,9 +3,9 @@
       id="org.eclipse.statet.eutils.autonature"
       version="4.0.0.qualifier"
       label="Auto Project Configuration"
-      provider-name="Eclipse.org"
+      provider-name="Eclipse StatET"
       license-feature="org.eclipse.license"
-      license-feature-version="1.0.1">
+      license-feature-version="0.0.0">
 
    <description url="https://www.eclipse.org/statet">
       Utility to configure projects (natures) automatically dependent on content types of files.
@@ -15,8 +15,8 @@
       Copyright (c) 2014, 2018 Stephan Wahlbrink and others. All rights reserved.
    </copyright>
 
-   <license url="%license_url">
-      %license_text
+   <license url="%licenseURL">
+      %license
    </license>
 
    <plugin
diff --git a/autonature/_assemblies/pom.xml b/autonature/_assemblies/pom.xml
new file mode 100644
index 0000000..4608c3d
--- /dev/null
+++ b/autonature/_assemblies/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ #=============================================================================#
+ # Copyright (c) 2018 Stephan Wahlbrink and others.
+ # 
+ # This program and the accompanying materials are made available under the
+ # terms of the Eclipse Public License 2.0 which is available at
+ # https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ # which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ # 
+ # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ # 
+ # Contributors:
+ #     Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
+ #=============================================================================#
+-->
+
+<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>org.eclipse.statet.eutils</groupId>
+		<artifactId>autonature</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+	</parent>
+	
+	<groupId>org.eclipse.statet.eutils-assemblies</groupId>
+	<artifactId>autonature</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.statet.eutils.autonature-feature</module>
+		
+	</modules>
+	
+</project>
diff --git a/autonature/_build/repo/category.xml b/autonature/_assemblies/repository/category.xml
similarity index 100%
rename from autonature/_build/repo/category.xml
rename to autonature/_assemblies/repository/category.xml
diff --git a/autonature/org.eclipse.statet.eutils.autonature/.gitignore b/autonature/org.eclipse.statet.eutils.autonature/.gitignore
index 7447f89..b7b8150 100644
--- a/autonature/org.eclipse.statet.eutils.autonature/.gitignore
+++ b/autonature/org.eclipse.statet.eutils.autonature/.gitignore
@@ -1 +1,3 @@
-/bin
\ No newline at end of file
+/bin/
+/doc/
+/target/
diff --git a/autonature/org.eclipse.statet.eutils.autonature/META-INF/MANIFEST.MF b/autonature/org.eclipse.statet.eutils.autonature/META-INF/MANIFEST.MF
index 70bbd4f..3f800ac 100644
--- a/autonature/org.eclipse.statet.eutils.autonature/META-INF/MANIFEST.MF
+++ b/autonature/org.eclipse.statet.eutils.autonature/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.statet.eutils.autonature;singleton:=true
 Bundle-Version: 4.0.0.qualifier
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: Eclipse StatET
 Bundle-Name: StatET EUtils - Auto-Nature
 Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.statet.eutils.autonature.internal.nostart"
 Bundle-Activator: org.eclipse.statet.internal.eutils.autonature.Activator
diff --git a/autonature/pom.xml b/autonature/pom.xml
new file mode 100644
index 0000000..84bc867
--- /dev/null
+++ b/autonature/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ #=============================================================================#
+ # Copyright (c) 2018 Stephan Wahlbrink and others.
+ # 
+ # This program and the accompanying materials are made available under the
+ # terms of the Eclipse Public License 2.0 which is available at
+ # https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ # which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ # 
+ # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ # 
+ # Contributors:
+ #     Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
+ #=============================================================================#
+-->
+
+<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>org.eclipse.statet-eutils</groupId>
+		<artifactId>root</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+	</parent>
+	
+	<groupId>org.eclipse.statet.eutils</groupId>
+	<artifactId>autonature</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.statet.eutils.autonature</module>
+		
+		<module>_assemblies</module>
+		
+	</modules>
+	
+</project>
diff --git a/autorun/_build/org.eclipse.statet.eutils.autorun-feature/.project b/autorun/_assemblies/org.eclipse.statet.eutils.autorun-feature/.project
similarity index 100%
rename from autorun/_build/org.eclipse.statet.eutils.autorun-feature/.project
rename to autorun/_assemblies/org.eclipse.statet.eutils.autorun-feature/.project
diff --git a/autorun/_build/org.eclipse.statet.eutils.autorun-feature/build.properties b/autorun/_assemblies/org.eclipse.statet.eutils.autorun-feature/build.properties
similarity index 100%
rename from autorun/_build/org.eclipse.statet.eutils.autorun-feature/build.properties
rename to autorun/_assemblies/org.eclipse.statet.eutils.autorun-feature/build.properties
diff --git a/autorun/_build/org.eclipse.statet.eutils.autorun-feature/feature.properties b/autorun/_assemblies/org.eclipse.statet.eutils.autorun-feature/feature.properties
similarity index 100%
rename from autorun/_build/org.eclipse.statet.eutils.autorun-feature/feature.properties
rename to autorun/_assemblies/org.eclipse.statet.eutils.autorun-feature/feature.properties
diff --git a/autorun/_build/org.eclipse.statet.eutils.autorun-feature/feature.xml b/autorun/_assemblies/org.eclipse.statet.eutils.autorun-feature/feature.xml
similarity index 83%
rename from autorun/_build/org.eclipse.statet.eutils.autorun-feature/feature.xml
rename to autorun/_assemblies/org.eclipse.statet.eutils.autorun-feature/feature.xml
index edf4371..de17eeb 100644
--- a/autorun/_build/org.eclipse.statet.eutils.autorun-feature/feature.xml
+++ b/autorun/_assemblies/org.eclipse.statet.eutils.autorun-feature/feature.xml
@@ -3,9 +3,9 @@
       id="org.eclipse.statet.eutils.autorun"
       version="4.0.0.qualifier"
       label="Auto Run"
-      provider-name="Eclipse.org"
+      provider-name="Eclipse StatET"
       license-feature="org.eclipse.license"
-      license-feature-version="1.0.1">
+      license-feature-version="0.0.0">
 
    <description url="https://www.eclipse.org/statet">
       Utility to run a launch configuration at startup of Eclipse automatically.
@@ -15,8 +15,8 @@
       Copyright (c) 2003, 2018 Stephan Wahlbrink and others. All rights reserved.
    </copyright>
 
-   <license url="%license_url">
-      %license_text
+   <license url="%licenseURL">
+      %license
    </license>
 
    <plugin
diff --git a/autorun/_assemblies/pom.xml b/autorun/_assemblies/pom.xml
new file mode 100644
index 0000000..a3f2a0c
--- /dev/null
+++ b/autorun/_assemblies/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ #=============================================================================#
+ # Copyright (c) 2018 Stephan Wahlbrink and others.
+ # 
+ # This program and the accompanying materials are made available under the
+ # terms of the Eclipse Public License 2.0 which is available at
+ # https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ # which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ # 
+ # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ # 
+ # Contributors:
+ #     Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
+ #=============================================================================#
+-->
+
+<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>org.eclipse.statet.eutils</groupId>
+		<artifactId>autorun</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+	</parent>
+	
+	<groupId>org.eclipse.statet.eutils-assemblies</groupId>
+	<artifactId>autorun</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.statet.eutils.autorun-feature</module>
+		
+	</modules>
+	
+</project>
diff --git a/autorun/_build/repo/category.xml b/autorun/_assemblies/repository/category.xml
similarity index 100%
rename from autorun/_build/repo/category.xml
rename to autorun/_assemblies/repository/category.xml
diff --git a/autorun/org.eclipse.statet.eutils.autorun/.gitignore b/autorun/org.eclipse.statet.eutils.autorun/.gitignore
index 7447f89..09e3bc9 100644
--- a/autorun/org.eclipse.statet.eutils.autorun/.gitignore
+++ b/autorun/org.eclipse.statet.eutils.autorun/.gitignore
@@ -1 +1,2 @@
-/bin
\ No newline at end of file
+/bin/
+/target/
diff --git a/autorun/org.eclipse.statet.eutils.autorun/META-INF/MANIFEST.MF b/autorun/org.eclipse.statet.eutils.autorun/META-INF/MANIFEST.MF
index 61d99ac..8216f67 100644
--- a/autorun/org.eclipse.statet.eutils.autorun/META-INF/MANIFEST.MF
+++ b/autorun/org.eclipse.statet.eutils.autorun/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.statet.eutils.autorun;singleton:=true
 Bundle-Version: 4.0.0.qualifier
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: Eclipse StatET
 Bundle-Name: StatET EUtils - Auto Run
 Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.statet.eutils.autorun.internal.nostart"
 Bundle-Activator: org.eclipse.statet.internal.eutils.autorun.Activator
diff --git a/autorun/pom.xml b/autorun/pom.xml
new file mode 100644
index 0000000..40aebda
--- /dev/null
+++ b/autorun/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ #=============================================================================#
+ # Copyright (c) 2018 Stephan Wahlbrink and others.
+ # 
+ # This program and the accompanying materials are made available under the
+ # terms of the Eclipse Public License 2.0 which is available at
+ # https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ # which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ # 
+ # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ # 
+ # Contributors:
+ #     Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
+ #=============================================================================#
+-->
+
+<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>org.eclipse.statet-eutils</groupId>
+		<artifactId>root</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+	</parent>
+	
+	<groupId>org.eclipse.statet.eutils</groupId>
+	<artifactId>autorun</artifactId>
+	<packaging>pom</packaging>
+	
+	<modules>
+		<module>org.eclipse.statet.eutils.autorun</module>
+		
+		<module>_assemblies</module>
+		
+	</modules>
+	
+</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..1ff0d70
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ #=============================================================================#
+ # Copyright (c) 2018 Stephan Wahlbrink and others.
+ # 
+ # This program and the accompanying materials are made available under the
+ # terms of the Eclipse Public License 2.0 which is available at
+ # https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+ # which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ # 
+ # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ # 
+ # Contributors:
+ #     Stephan Wahlbrink <sw@wahlbrink.eu> - initial API and implementation
+ #=============================================================================#
+-->
+
+<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>org.eclipse.statet-releng</groupId>
+		<artifactId>parent</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+		<relativePath>../org.eclipse.statet/releng/</relativePath>
+	</parent>
+	
+	<groupId>org.eclipse.statet-eutils</groupId>
+	<artifactId>root</artifactId>
+	<version>4.0.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	
+	<properties>
+		<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/statet/org.eclipse.statet-eutils.git</tycho.scmUrl>
+	</properties>
+	
+	<modules>
+		<module>autonature</module>
+		<module>autorun</module>
+		
+	</modules>
+	
+</project>