diff --git a/reactor/.idea/compiler.xml b/reactor/.idea/compiler.xml
index 018b63bf..1cfc7b50 100644
--- a/reactor/.idea/compiler.xml
+++ b/reactor/.idea/compiler.xml
@@ -44,7 +44,7 @@
       <module name="API" target="1.6" />
       <module name="Core" target="1.6" />
       <module name="main" target="1.5" />
-      <module name="Reactor" target="1.5" />
+      <module name="Reactor" target="1.6" />
       <module name="Test" target="1.6" />
     </bytecodeTargetLevel>
   </component>
diff --git a/reactor/Core/Core.iml b/reactor/Core/Core.iml
index 8ce478b9..dcf36cff 100644
--- a/reactor/Core/Core.iml
+++ b/reactor/Core/Core.iml
@@ -5,6 +5,8 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/reactor/Core/pom.xml b/reactor/Core/pom.xml
index db9a1af7..2e25a79a 100644
--- a/reactor/Core/pom.xml
+++ b/reactor/Core/pom.xml
@@ -4,56 +4,26 @@
          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>
 
-    <artifactId>core</artifactId>
-    <packaging>jar</packaging>
-
     <parent>
         <groupId>jetbrains.mps.logic.reactor</groupId>
         <artifactId>main</artifactId>
-        <version>${reactor.version}</version>
+        <version>0.1</version>
         <relativePath>..</relativePath>
     </parent>
 
+    <artifactId>core</artifactId>
+    <packaging>jar</packaging>
+
     <dependencies>
         <dependency>
             <groupId>jetbrains.mps.logic.reactor</groupId>
             <artifactId>api</artifactId>
-            <version>${reactor.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
     </dependencies>
 
     <build>
         <sourceDirectory>${basedir}/src/</sourceDirectory>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven.version}</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <version>${kotlin.version}</version>
-
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <phase>compile</phase>
-                        <goals> <goal>compile</goal> </goals>
-                    </execution>
-
-                    <execution>
-                        <id>test-compile</id>
-                        <phase>test-compile</phase>
-                        <goals> <goal>test-compile</goal> </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
     </build>
 
 </project>
diff --git a/reactor/Reactor.iml b/reactor/Reactor.iml
index 245d2835..69d97917 100644
--- a/reactor/Reactor.iml
+++ b/reactor/Reactor.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
diff --git a/reactor/Test/pom.xml b/reactor/Test/pom.xml
index 988af315..7b7d8db4 100644
--- a/reactor/Test/pom.xml
+++ b/reactor/Test/pom.xml
@@ -4,66 +4,37 @@
          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>
 
-    <artifactId>tests</artifactId>
-
     <parent>
         <groupId>jetbrains.mps.logic.reactor</groupId>
         <artifactId>main</artifactId>
-        <version>${reactor.version}</version>
+        <version>0.1</version>
         <relativePath>..</relativePath>
     </parent>
 
+    <artifactId>tests</artifactId>
+    <packaging>jar</packaging>
+
     <dependencies>
         <dependency>
             <groupId>jetbrains.mps.logic.reactor</groupId>
             <artifactId>api</artifactId>
-            <version>${reactor.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>jetbrains.mps.logic.reactor</groupId>
             <artifactId>core</artifactId>
-            <version>${reactor.version}</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
         <testSourceDirectory>${basedir}/test/</testSourceDirectory>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven.version}</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <version>${kotlin.version}</version>
-
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <phase>compile</phase>
-                        <goals> <goal>compile</goal> </goals>
-                    </execution>
-
-                    <execution>
-                        <id>test-compile</id>
-                        <phase>test-compile</phase>
-                        <goals> <goal>test-compile</goal> </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
     </build>
 
 </project>
diff --git a/reactor/pom.xml b/reactor/pom.xml
index 6e851dce..155182b4 100644
--- a/reactor/pom.xml
+++ b/reactor/pom.xml
@@ -7,16 +7,13 @@
 
 
     <properties>
-        <reactor.version>0.1</reactor.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <kotlin.version>1.0.0-beta-3595</kotlin.version>
-        <junit.version>4.12</junit.version>
-        <maven.version>3.2</maven.version>
     </properties>
 
     <groupId>jetbrains.mps.logic.reactor</groupId>
     <artifactId>main</artifactId>
-    <version>${reactor.version}</version>
+    <version>0.1</version>
     <packaging>pom</packaging>
 
     <dependencies>
@@ -64,6 +61,40 @@
         </repository>
     </repositories>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.2</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <version>${kotlin.version}</version>
+
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals> <goal>compile</goal> </goals>
+                    </execution>
+
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals> <goal>test-compile</goal> </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
     <modules>
         <module>API</module>
         <module>Core</module>