diff --git a/nephele/nephele-hdfs/pom.xml b/nephele/nephele-hdfs/pom.xml
index 36af3281effa7115252b77afa303801d42229688..1bb5087e0cdac44c4d117f6d5f08583220d73573 100644
--- a/nephele/nephele-hdfs/pom.xml
+++ b/nephele/nephele-hdfs/pom.xml
@@ -56,5 +56,4 @@
 		</profile>
 	</profiles>
 
-
 </project>
diff --git a/pact/pact-compiler/pom.xml b/pact/pact-compiler/pom.xml
index 66816d4d1c12e186c17954497cf0e941e0796574..a9245ab6b3052bb14c156f7a496daa9ae44db867 100644
--- a/pact/pact-compiler/pom.xml
+++ b/pact/pact-compiler/pom.xml
@@ -16,21 +16,18 @@
 	<packaging>jar</packaging>
 
 	<dependencies>
-
 		<dependency>
 			<groupId>eu.stratosphere</groupId>
 			<artifactId>pact-common</artifactId>
 			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>eu.stratosphere</groupId>
 			<artifactId>pact-runtime</artifactId>
 			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
-
 	</dependencies>
 
 	<reporting>
diff --git a/pact/pact-examples/pom.xml b/pact/pact-examples/pom.xml
index cf3325ad194573d8b8329da7c368602fa9442d80..76513988301d66c3f1b9320cb32ee79f48851af5 100644
--- a/pact/pact-examples/pom.xml
+++ b/pact/pact-examples/pom.xml
@@ -21,14 +21,6 @@
 			<groupId>eu.stratosphere</groupId>
 			<artifactId>pact-common</artifactId>
 			<version>${project.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>pact-hbase</artifactId>
-			<version>${project.version}</version>
-			<scope>compile</scope>
 		</dependency>
 
 	</dependencies>
@@ -47,31 +39,6 @@
 				<version>2.4</version>
 				<executions>
 
-					<!-- HBaseExample
-					<execution>
-						<id>HBaseExample</id>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<classifier>HBaseExample</classifier>
-
-							<archive>
-								<manifestEntries>
-									<Pact-Assembler-Class>eu.stratosphere.pact.example.hbase.HBaseReadExample</Pact-Assembler-Class>
-								</manifestEntries>
-							</archive>
-
-							<includes>
-								<include>**/hbase/*.class</include>
-								<include>**/util/ConfigUtils.class</include>
-							</includes>
-						</configuration>
-					</execution>
-					-->
-					
-
 					<!-- Connected Components -->
 					<execution>
 						<id>ConnectedComponents</id>
@@ -365,4 +332,85 @@
 
 		</plugins>
 	</build>
+
+	<!-- See main pom.xml for explanation of profiles -->
+	<profiles>
+		<profile>
+			<id>hadoop_yarn</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>eu.stratosphere</groupId>
+					<artifactId>pact-hbase</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-jar-plugin</artifactId>
+						<version>2.4</version>
+						<executions>
+		
+							<!-- HBaseExample -->
+							<execution>
+								<id>HBaseExample</id>
+								<phase>package</phase>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+								<configuration>
+									<classifier>HBaseExample</classifier>
+		
+									<archive>
+										<manifestEntries>
+											<Pact-Assembler-Class>eu.stratosphere.pact.example.hbase.HBaseReadExample</Pact-Assembler-Class>
+										</manifestEntries>
+									</archive>
+		
+									<includes>
+										<include>**/hbase/*.class</include>
+										<include>**/util/ConfigUtils.class</include>
+									</includes>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		
+		<profile>
+			<id>hadoop_v1</id>
+			<dependencies>
+        		<!-- No extra dependencies: pact-hbase is currently not compatible with Hadoop v1 -->
+			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>default-compile</id>
+								<phase>compile</phase>
+								<configuration>
+									<excludes>
+										<exclude>**/hbase/*.java</exclude>
+									</excludes>
+								</configuration>
+								<goals>
+									<goal>compile</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+  
 </project>
diff --git a/pact/pact-hbase/pom.xml b/pact/pact-hbase/pom.xml
index b484b1a5ffb7528b4ececc9a8d2d37c7e9780b29..ef4b556d670bb7e1327ec2c897588230dc297896 100644
--- a/pact/pact-hbase/pom.xml
+++ b/pact/pact-hbase/pom.xml
@@ -1,36 +1,44 @@
 <?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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>pact</artifactId>
-    <groupId>eu.stratosphere</groupId>
-    <version>0.2-ozone</version>
-  </parent>
+<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/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<artifactId>pact</artifactId>
+		<groupId>eu.stratosphere</groupId>
+		<version>0.2-ozone</version>
+	</parent>
+  
 	<artifactId>pact-hbase</artifactId>
 	<name>pact-hbase</name>
+  
 	<packaging>jar</packaging>
+
 	<dependencies>
 		<dependency>
 			<groupId>eu.stratosphere</groupId>
 			<artifactId>pact-common</artifactId>
 			<version>${version}</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.apache.hbase</groupId>
 			<artifactId>hbase</artifactId>
 			<version>0.94.2-cdh4.2.1</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.apache.hadoop</groupId>
 			<artifactId>hadoop-client</artifactId>
 			<version>${hadoop.version}</version>
 		</dependency>
-	</dependencies>
+    </dependencies>
 
-	<!--
-		hadoop-clients is available for yarn and non-yarn, so there is no need to use profiles
+    <!--
+		hadoop-client is available for yarn and non-yarn, so there is no need to use profiles
 		See ticket https://issues.apache.org/jira/browse/HADOOP-8009 for description of hadoop-clients
-	-->
+    -->
 
 	<reporting>
 		<plugins>
diff --git a/pact/pact-runtime/pom.xml b/pact/pact-runtime/pom.xml
index d3d07e7820a35aca83f0a2ade82802ca991723cf..b17254694e38e472ab3a4b00e31dfbffe6bd6904 100644
--- a/pact/pact-runtime/pom.xml
+++ b/pact/pact-runtime/pom.xml
@@ -16,25 +16,21 @@
 	<packaging>jar</packaging>
 
 	<dependencies>
-
 		<dependency>
 			<groupId>eu.stratosphere</groupId>
 			<artifactId>pact-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>eu.stratosphere</groupId>
 			<artifactId>nephele-server</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>eu.stratosphere</groupId>
 			<artifactId>pact-array-datamodel</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
 	</dependencies>
 
 	<!-- See main pom.xml for explanation of profiles -->
@@ -71,7 +67,6 @@
 
 	<build>
 		<plugins>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
diff --git a/pact/pom.xml b/pact/pom.xml
index 8effb34e72eb073684f600693ebc5b17e0ac2886..3d770dd1b93394de320241af5f800b26288f99a8 100644
--- a/pact/pom.xml
+++ b/pact/pom.xml
@@ -63,25 +63,6 @@
 
 		</plugins>
 	</build>
-	
-	
-  <profiles>
-    <profile>
-      <id>hadoop_yarn</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>pact-hbase</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>hadoop_v1</id>
-      <modules>
-        <!-- No extra modules: pact-hbase is currently not compatible with Hadoop v1 -->
-      </modules>
-    </profile>
-  </profiles>
 
 	<modules>
 		<module>pact-common</module>
@@ -93,4 +74,23 @@
 		<module>pact-tests</module>
 		<module>pact-array-datamodel</module>
 	</modules>
+	
+	<profiles>
+		<profile>
+			<id>hadoop_yarn</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<modules>
+				<module>pact-hbase</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>hadoop_v1</id>
+			<modules>
+				<!-- No extra modules: pact-hbase is currently not compatible with Hadoop v1 -->
+			</modules>
+		</profile>
+	</profiles>
+
 </project>
diff --git a/stratosphere-dist/pom.xml b/stratosphere-dist/pom.xml
index 912f53749902ab659c85038aee91145d0d291186..54ac05793cdedde26792b00453647633f625e1ed 100644
--- a/stratosphere-dist/pom.xml
+++ b/stratosphere-dist/pom.xml
@@ -91,13 +91,32 @@
 			<artifactId>pact-runtime</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>eu.stratosphere</groupId>
-			<artifactId>pact-hbase</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 	</dependencies>
 
+	<!-- See main pom.xml for explanation of profiles -->
+	<profiles>
+		<profile>
+			<id>hadoop_yarn</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>eu.stratosphere</groupId>
+					<artifactId>pact-hbase</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+			</dependencies>
+		</profile>
+		
+		<profile>
+			<id>hadoop_v1</id>
+			<dependencies>
+        		<!-- No extra dependencies: pact-hbase is currently not compatible with Hadoop v1 -->
+			</dependencies>
+		</profile>
+	</profiles>
+
 	<build>
 		<plugins>
 			<plugin>