diff --git a/.gitignore b/.gitignore
index d022893..7312bae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,8 @@ bin/
 gen/
 out/
 
+*.tag
+
 # Local configuration file (sdk path, etc)
 local.properties
 release.properties
diff --git a/boundbox-library-integration-tests/pom.xml.tag b/boundbox-library-integration-tests/pom.xml.tag
deleted file mode 100644
index 9f88f72..0000000
--- a/boundbox-library-integration-tests/pom.xml.tag
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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>
-		<groupId>org.boundbox</groupId>
-		<artifactId>boundbox-parent</artifactId>
-		<version>1.2.0</version>
-		<relativePath>..</relativePath>
-	</parent>
-
-	<artifactId>boundbox-sample-integration-tests</artifactId>
-	<name>BoundBox Library Integration tests</name>
-	<packaging>jar</packaging>
-
-	<properties>
-		<!-- infomation -->
-		<root.basedir>${project.parent.basedir}</root.basedir>
-		<maven-compiler-plugin.version>2.5.1</maven-compiler-plugin.version>
-		<build-helper-maven-plugin.version>1.8</build-helper-maven-plugin.version>
-		
-		<!-- feature flipping -->
-		<log.level>Level.OFF</log.level>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.boundbox</groupId>
-			<artifactId>boundbox-library</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.easymock</groupId>
-			<artifactId>easymock</artifactId>
-			<version>3.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>findbugs</groupId>
-			<artifactId>annotations</artifactId>
-			<version>1.0.0</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${project.build.directory}/generated-sources/annotations/</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-					<annotationProcessors>
-						<annotationProcessor>org.boundbox.processor.BoundBoxProcessor</annotationProcessor>
-					</annotationProcessors>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/boundbox-library/dependency-reduced-pom.xml b/boundbox-library/dependency-reduced-pom.xml
index 3ea17c3..68335d8 100644
--- a/boundbox-library/dependency-reduced-pom.xml
+++ b/boundbox-library/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>boundbox-parent</artifactId>
     <groupId>org.boundbox</groupId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>boundbox-library</artifactId>
@@ -56,10 +56,13 @@
         <executions>
           <execution>
             <id>filter-src</id>
-            <phase>process-sources</phase>
             <goals>
               <goal>filter-sources</goal>
             </goals>
+            <configuration>
+              <sourceDirectory>${basedir}/src/main/java-templates</sourceDirectory>
+              <outputDirectory>${project.build.directory}/generated-sources/java-templates</outputDirectory>
+            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -119,7 +122,7 @@
   </build>
   <profiles>
     <profile>
-      <id>silent</id>
+      <id>release</id>
       <properties>
         <log.level>Level.OFF</log.level>
       </properties>
diff --git a/boundbox-library/pom.xml.tag b/boundbox-library/pom.xml.tag
deleted file mode 100644
index 82348e4..0000000
--- a/boundbox-library/pom.xml.tag
+++ /dev/null
@@ -1,267 +0,0 @@
-<?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>
-		<groupId>org.boundbox</groupId>
-		<artifactId>boundbox-parent</artifactId>
-		<version>1.2.0</version>
-	</parent>
-
-	<artifactId>boundbox-library</artifactId>
-	<packaging>jar</packaging>
-
-	<properties>
-		<java.version>1.6</java.version>
-		<lombok.version>0.12.0</lombok.version>
-		<commons-lang.version>3.1</commons-lang.version>
-		<commons-io.version>1.3.2</commons-io.version>
-		<easymock.version>3.2</easymock.version>
-		<junit.version>4.11</junit.version>
-		<javawriter.version>2.2.0</javawriter.version>
-		<maven-compiler-plugin.version>2.5.1</maven-compiler-plugin.version>
-		<jacoco-maven-plugin.version>0.6.3.201306030806</jacoco-maven-plugin.version>
-		<maven-shade-plugin.version>2.1</maven-shade-plugin.version>
-
-		<!-- feature flipping -->
-		<log.level>Level.ALL</log.level>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>${lombok.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>${commons-lang.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>${commons-io.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.squareup</groupId>
-			<artifactId>javawriter</artifactId>
-			<version>${javawriter.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.easymock</groupId>
-			<artifactId>easymock</artifactId>
-			<version>${easymock.version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<sourceDirectory>src/main/java</sourceDirectory>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${maven-compiler-plugin.version}</version>
-				<configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
-					<annotationProcessors>
-						<annotationProcessor>lombok.core.AnnotationProcessor</annotationProcessor>
-					</annotationProcessors>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>templating-maven-plugin</artifactId>
-				<version>1.0-alpha-3</version>
-				<executions>
-					<execution>
-						<id>filter-src</id>
-						<goals>
-							<goal>filter-sources</goal>
-						</goals>
-						<phase>process-sources</phase>
-					</execution>
-				</executions>
-			</plugin>
-			<!-- Uber jar -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>${maven-shade-plugin.version}</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<minimizeJar>true</minimizeJar>
-							<keepDependenciesWithProvidedScope>false</keepDependenciesWithProvidedScope>
-							<shadedArtifactAttached>false</shadedArtifactAttached>
-							<artifactSet>
-								<includes>
-									<include>org.apache.commons:*</include>
-									<!-- This include is for Travis only -->
-									<include>commons-io:*</include>
-									<include>com.squareup:*</include>
-								</includes>
-							</artifactSet>
-							<relocations>
-								<relocation>
-									<pattern>org.apache</pattern>
-									<shadedPattern>org.shaded</shadedPattern>
-								</relocation>
-								<!-- This relocation is for Travis only -->
-								<relocation>
-									<pattern>commons-io</pattern>
-									<shadedPattern>org.shaded</shadedPattern>
-								</relocation>
-								<relocation>
-									<pattern>com.squareup</pattern>
-									<shadedPattern>com.shaded</shadedPattern>
-								</relocation>
-							</relocations>
-							<filters>
-								<filter>
-									<artifact>*:*</artifact>
-									<excludes>
-										<exclude>META-INF/license/**</exclude>
-										<exclude>META-INF/*</exclude>
-										<exclude>META-INF/maven/**</exclude>
-										<exclude>LICENSE</exclude>
-										<exclude>NOTICE</exclude>
-										<exclude>/*.txt</exclude>
-										<exclude>templates/**</exclude>
-									</excludes>
-								</filter>
-							</filters>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings 
-					only. It has no influence on the Maven build itself. -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.codehaus.mojo
-										</groupId>
-										<artifactId>
-											templating-maven-plugin
-										</artifactId>
-										<versionRange>
-											[1.0-alpha-3,)
-										</versionRange>
-										<goals>
-											<goal>filter-sources</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>release</id>
-			<properties>
-				<log.level>Level.OFF</log.level>
-			</properties>
-		</profile>
-
-		<profile>
-			<id>coveralls</id>
-			<activation>
-				<property>
-					<name>skipTests</name>
-					<value>false</value>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<!-- CODE COVERAGE FOR UNIT-TESTS http://www.javacodegeeks.com/2013/08/creating-code-coverage-reports-for-unit-and-integration-tests-with-the-jacoco-maven-plugin.html -->
-					<plugin>
-						<groupId>org.jacoco</groupId>
-						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>${jacoco-maven-plugin.version}</version>
-						<configuration>
-							<excludes>
-								<exclude>**/*Exception.class</exclude>
-							</excludes>
-						</configuration>
-						<executions>
-							<!-- Prepares the property pointing to the JaCoCo runtime agent which 
-								is passed as VM argument when Maven the Surefire plugin is executed. -->
-							<execution>
-								<id>pre-unit-test</id>
-								<goals>
-									<goal>prepare-agent</goal>
-								</goals>
-								<configuration>
-									<!-- Sets the path to the file which contains the execution data. -->
-									<destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
-								</configuration>
-							</execution>
-							<!-- Ensures that the code coverage report for unit tests is created 
-								after unit tests have been run. -->
-							<execution>
-								<id>post-unit-test</id>
-								<phase>test</phase>
-								<goals>
-									<goal>report</goal>
-								</goals>
-								<configuration>
-									<!-- Sets the path to the file which contains the execution data. -->
-									<dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
-									<!-- Sets the output directory for the code coverage report. -->
-									<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.eluder.coveralls</groupId>
-						<artifactId>coveralls-maven-plugin</artifactId>
-						<version>2.0.1</version>
-						<executions>
-							<execution>
-								<id>post-unit-test</id>
-								<phase>test</phase>
-								<goals>
-									<goal>jacoco</goal>
-								</goals>
-								<configuration>
-									<coverageFile>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</coverageFile>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
diff --git a/pom.xml.tag b/pom.xml.tag
deleted file mode 100644
index deae14a..0000000
--- a/pom.xml.tag
+++ /dev/null
@@ -1,232 +0,0 @@
-<?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>
-
-	<!-- Sonatype config to publish on Maven Central -->
-	<parent>
-		<groupId>org.sonatype.oss</groupId>
-		<artifactId>oss-parent</artifactId>
-		<version>7</version>
-	</parent>
-
-	<groupId>org.boundbox</groupId>
-	<artifactId>boundbox-parent</artifactId>
-	<version>1.2.0</version>
-	<packaging>pom</packaging>
-	<description>TODO.</description>
-	<url>https://github.com/stephanenicolas/boundbox.git</url>
-	<inceptionYear>2013</inceptionYear>
-
-	<scm>
-		<connection>scm:git:ssh://git@github.com/stephanenicolas/boundbox.git</connection>
-		<url>git:ssh://git@github.com/stephanenicolas/boundbox.git</url>
-		<developerConnection>scm:git:ssh://git@github.com/stephanenicolas/boundbox.git</developerConnection>
-		<tag>HEAD</tag>
-	</scm>
-
-	<licenses>
-		<license>
-			<name>Apache 2</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-		</license>
-	</licenses>
-
-	<issueManagement>
-		<system>Github Issue Tracker</system>
-		<url>https://github.com/stephanenicolas/boundbox/issues</url>
-	</issueManagement>
-
-	<developers>
-		<developer>
-			<id>SNI</id>
-			<name>Stéphane Nicolas</name>
-			<email>steff.nicolas@gmail.com</email>
-		</developer>
-	</developers>
-
-	<modules>
-		<module>boundbox-library</module>
-		<module>boundbox-library-integration-tests</module>
-		<module>samples/boundbox-sample</module>
-		<module>samples/boundbox-android-sample</module>
-		<module>samples/boundbox-android-sample-tests</module>
-	</modules>
-
-	<properties>
-		<!-- Plugins -->
-		<maven-compiler-plugin.version>2.5.1</maven-compiler-plugin.version>
-		<android-maven-plugin.version>3.6.1</android-maven-plugin.version>
-		<maven-pmd-plugin.version>2.7.1</maven-pmd-plugin.version>
-		<findbugs-maven-plugin.version>2.5.2</findbugs-maven-plugin.version>
-		<maven-checkstyle-plugin.version>2.9.1</maven-checkstyle-plugin.version>
-		<lint-maven-plugin.version>0.0.6</lint-maven-plugin.version>
-		<eclipse-lifecycle-plugin.version>1.0.0</eclipse-lifecycle-plugin.version>
-	</properties>
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-enforcer-plugin</artifactId>
-										<versionRange>[1.0.0,)</versionRange>
-										<goals>
-											<goal>enforce</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>com.lewisd</groupId>
-										<artifactId>lint-maven-plugin</artifactId>
-										<versionRange>[${lint-maven-plugin.version},)</versionRange>
-										<goals>
-											<goal>check</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-checkstyle-plugin</artifactId>
-										<versionRange>[${maven-checkstyle-plugin.version},)</versionRange>
-										<goals>
-											<goal>check</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.jacoco</groupId>
-										<artifactId>jacoco-maven-plugin</artifactId>
-										<versionRange>[0.6.3.201306030806,)</versionRange>
-										<goals>
-											<goal>prepare-agent</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-release-plugin</artifactId>
-					<configuration>
-						<autoVersionSubmodules>true</autoVersionSubmodules>
-						<releaseProfiles>release</releaseProfiles>
-					</configuration>
-				</plugin>
-				<!-- Quality Analysis Tools -->
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-checkstyle-plugin</artifactId>
-					<version>${maven-checkstyle-plugin.version}</version>
-					<configuration>
-						<configLocation>config/quality/checkstyle/checkstyle.xml</configLocation>
-						<enableRulesSummary>false</enableRulesSummary>
-					</configuration>
-					<executions>
-						<execution>
-							<id>checkstyle-check</id>
-							<phase>process-sources</phase>
-							<goals>
-								<goal>check</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>findbugs-maven-plugin</artifactId>
-					<version>${findbugs-maven-plugin.version}</version>
-					<configuration>
-						<excludeFilterFile>config/quality/findbugs/findbugs-filter.xml</excludeFilterFile>
-					</configuration>
-					<executions>
-						<execution>
-							<id>findbugs-check</id>
-							<phase>verify</phase>
-							<goals>
-								<goal>check</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-pmd-plugin</artifactId>
-					<version>${maven-pmd-plugin.version}</version>
-					<configuration>
-						<targetJdk>1.5</targetJdk>
-					</configuration>
-					<executions>
-						<execution>
-							<id>pmd-check</id>
-							<goals>
-								<goal>check</goal>
-								<goal>cpd-check</goal>
-							</goals>
-							<configuration>
-								<excludes>
-									<exclude>**/*annotations*/**/*.java</exclude>
-								</excludes>
-								<rulesets>
-									<ruleset>config/quality/pmd/pmd-ruleset.xml</ruleset>
-								</rulesets>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>com.lewisd</groupId>
-					<artifactId>lint-maven-plugin</artifactId>
-					<version>${lint-maven-plugin.version}</version>
-					<executions>
-						<execution>
-							<phase>validate</phase>
-							<goals>
-								<goal>check</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<!-- Quality analysis tools -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-pmd-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/samples/boundbox-android-sample-tests/pom.xml.tag b/samples/boundbox-android-sample-tests/pom.xml.tag
deleted file mode 100644
index 6e712e8..0000000
--- a/samples/boundbox-android-sample-tests/pom.xml.tag
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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>
-		<groupId>org.boundbox</groupId>
-		<artifactId>boundbox-parent</artifactId>
-		<version>1.2.0</version>
-		<relativePath>../..</relativePath>
-	</parent>
-
-	<artifactId>boundbox-android-sample-tests</artifactId>
-	<packaging>apk</packaging>
-	<name>boundbox-android-sample-tests</name>
-
-	<properties>
-		<!-- Android Dependencies -->
-		<android.platform.version>4.3_r2</android.platform.version>
-		<java.version>1.6</java.version>
-		<android.sdk.version>18</android.sdk.version>
-
-		<!-- Plugins -->
-		<maven-compiler-plugin.version>2.5.1</maven-compiler-plugin.version>
-		<android-maven-plugin.version>3.6.1</android-maven-plugin.version>
-		<build-helper-maven-plugin.version>1.8</build-helper-maven-plugin.version>
-		<maven-deploy-plugin>2.7</maven-deploy-plugin>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>android</groupId>
-			<artifactId>android</artifactId>
-			<version>${android.platform.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.boundbox</groupId>
-			<artifactId>boundbox-library</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.boundbox</groupId>
-			<artifactId>boundbox-android-sample</artifactId>
-			<version>${project.version}</version>
-			<type>apk</type>
-		</dependency>
-		<dependency>
-			<groupId>org.boundbox</groupId>
-			<artifactId>boundbox-android-sample</artifactId>
-			<version>${project.version}</version>
-			<type>jar</type>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>${maven-deploy-plugin}</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-				<artifactId>android-maven-plugin</artifactId>
-				<version>${android-maven-plugin.version}</version>
-				<extensions>true</extensions>
-				<configuration>
-					<sdk>
-						<!-- platform or api level (api level 16 = platform 4.1) -->
-						<platform>${android.sdk.version}</platform>
-					</sdk>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${project.build.directory}/generated-sources/annotations/</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
-					<annotationProcessors>
-						<annotationProcessor>org.boundbox.processor.BoundBoxProcessor</annotationProcessor>
-					</annotationProcessors>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-pmd-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/samples/boundbox-android-sample/pom.xml.tag b/samples/boundbox-android-sample/pom.xml.tag
deleted file mode 100644
index 2c90449..0000000
--- a/samples/boundbox-android-sample/pom.xml.tag
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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>
-		<groupId>org.boundbox</groupId>
-		<artifactId>boundbox-parent</artifactId>
-		<version>1.2.0</version>
-		<relativePath>../..</relativePath>
-	</parent>
-
-	<artifactId>boundbox-android-sample</artifactId>
-	<packaging>apk</packaging>
-	<name>boundbox-android-sample</name>
-
-	<properties>
-		<!-- Android Dependencies -->
-		<android.platform.version>4.3_r2</android.platform.version>
-		<java.version>1.6</java.version>
-		<android.sdk.version>18</android.sdk.version>
-
-		<!-- Plugins -->
-		<maven-compiler-plugin.version>2.5.1</maven-compiler-plugin.version>
-		<android-maven-plugin.version>3.6.1</android-maven-plugin.version>
-		<maven-deploy-plugin>2.7</maven-deploy-plugin>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>android</groupId>
-			<artifactId>android</artifactId>
-			<version>${android.platform.version}</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>${maven-deploy-plugin}</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-				<artifactId>android-maven-plugin</artifactId>
-				<version>${android-maven-plugin.version}</version>
-				<extensions>true</extensions>
-				<configuration>
-					<sdk>
-						<!-- platform or api level (api level 16 = platform 4.1) -->
-						<platform>${android.sdk.version}</platform>
-					</sdk>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
diff --git a/samples/boundbox-sample/pom.xml.tag b/samples/boundbox-sample/pom.xml.tag
deleted file mode 100644
index 37d41ba..0000000
--- a/samples/boundbox-sample/pom.xml.tag
+++ /dev/null
@@ -1,95 +0,0 @@
-<?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>
-		<groupId>org.boundbox</groupId>
-		<artifactId>boundbox-parent</artifactId>
-		<version>1.2.0</version>
-		<relativePath>../..</relativePath>
-	</parent>
-
-	<artifactId>boundbox-sample</artifactId>
-	<name>BoundBox Sample</name>
-	<packaging>jar</packaging>
-
-	<properties>
-		<!-- infomation -->
-		<root.basedir>${project.parent.basedir}</root.basedir>
-		<java.version>1.6</java.version>
-		<easymock.version>3.2</easymock.version>
-		<junit.version>4.11</junit.version>
-		<findbugs.version>1.0.0</findbugs.version>
-		<maven-compiler-plugin.version>2.5.1</maven-compiler-plugin.version>
-		<build-helper-maven-plugin.version>1.8</build-helper-maven-plugin.version>
-		<maven-deploy-plugin.version>2.7</maven-deploy-plugin.version>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.boundbox</groupId>
-			<artifactId>boundbox-library</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.easymock</groupId>
-			<artifactId>easymock</artifactId>
-			<version>${easymock.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>findbugs</groupId>
-			<artifactId>annotations</artifactId>
-			<version>${findbugs.version}</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>${maven-deploy-plugin.version}</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${project.build.directory}/generated-sources/annotations/</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
-					<annotationProcessors>
-						<annotationProcessor>org.boundbox.processor.BoundBoxProcessor</annotationProcessor>
-					</annotationProcessors>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>