diff --git a/public/c++/VectorPairHMM/pom.xml b/public/VectorPairHMM/pom.xml
similarity index 80%
rename from public/c++/VectorPairHMM/pom.xml
rename to public/VectorPairHMM/pom.xml
index ce0692799..b310148d6 100644
--- a/public/c++/VectorPairHMM/pom.xml
+++ b/public/VectorPairHMM/pom.xml
@@ -6,20 +6,20 @@
         <groupId>org.broadinstitute.sting</groupId>
         <artifactId>sting-root</artifactId>
         <version>2.8-SNAPSHOT</version>
-        <relativePath>../../../public/sting-root</relativePath>
+        <relativePath>../../public/sting-root</relativePath>
     </parent>
 
     <artifactId>VectorPairHMM</artifactId>
     <packaging>pom</packaging>
     <name>Vectorized PairHMM native libraries</name>
 
-    <description>Builds a platform dependent version of pairhmm. During install, copies it into sting-utils.</description>
+    <description>Builds a GNU/Linux x86_64 version of VectorPairHMM. During install, copies it into sting-utils.</description>
 
     <properties>
         <sourceEncoding>UTF-8</sourceEncoding>
         <project.build.sourceEncoding>${sourceEncoding}</project.build.sourceEncoding>
         <project.reporting.outputEncoding>${sourceEncoding}</project.reporting.outputEncoding>
-        <sting.basedir>${project.basedir}/../../..</sting.basedir>
+        <sting.basedir>${project.basedir}/../..</sting.basedir>
         <sting-utils.basedir>${sting.basedir}/public/sting-utils</sting-utils.basedir>
         <!-- Where to place the library in sting-utils -->
         <pairhmm.resources.directory>${sting-utils.basedir}/src/main/resources/org/broadinstitute/sting/utils/pairhmm</pairhmm.resources.directory>
@@ -33,8 +33,6 @@
         -->
         <pairhmm.build.architecture>x86_64</pairhmm.build.architecture>
         <pairhmm.build.extension>so</pairhmm.build.extension>
-        <pairhmm.build.cxxflags>-Wall</pairhmm.build.cxxflags>
-        <pairhmm.build.ldflags>-dynamiclib</pairhmm.build.ldflags>
     </properties>
     <build>
         <plugins>
@@ -64,12 +62,10 @@
                         <phase>compile</phase>
                         <configuration>
                             <executable>make</executable>
-                            <workingDirectory>.</workingDirectory>
+                            <workingDirectory>src/main/c++</workingDirectory>
                             <environmentVariables>
                                 <ARCHITECTURE>${pairhmm.build.architecture}</ARCHITECTURE>
-                                <LIB_EXT>${pairhmm.build.extension}</LIB_EXT>
-                                <CXXFLAGS>${pairhmm.build.cxxflags}</CXXFLAGS>
-                                <LDFLAGS>${pairhmm.build.ldflags}</LDFLAGS>
+                                <JRE_HOME>${java.home}</JRE_HOME>
                                 <OUTPUT_DIR>${project.build.directory}</OUTPUT_DIR>
                             </environmentVariables>
                         </configuration>
@@ -132,21 +128,6 @@
 
     <profiles>
 
-        <profile>
-            <id>mac_x86_64</id>
-            <activation>
-                <os>
-                    <family>mac</family>
-                    <arch>x86_64</arch>
-                </os>
-            </activation>
-            <properties>
-                <pairhmm.build.architecture>mac_x86_64</pairhmm.build.architecture>
-                <pairhmm.build.extension>jnilib</pairhmm.build.extension>
-                <pairhmm.build.ldflags>-dynamiclib</pairhmm.build.ldflags>
-            </properties>
-        </profile>
-
         <profile>
             <id>linux_x86_64</id>
             <activation>
@@ -157,9 +138,6 @@
             </activation>
             <properties>
                 <pairhmm.build.architecture>linux_x86_64</pairhmm.build.architecture>
-                <pairhmm.build.extension>jnilib</pairhmm.build.extension>
-                <pairhmm.build.cxxflags>-fPIC</pairhmm.build.cxxflags>
-                <pairhmm.build.ldflags>-shared</pairhmm.build.ldflags>
             </properties>
         </profile>
 
diff --git a/public/c++/VectorPairHMM/.gitignore b/public/VectorPairHMM/src/main/c++/.gitignore
similarity index 100%
rename from public/c++/VectorPairHMM/.gitignore
rename to public/VectorPairHMM/src/main/c++/.gitignore
diff --git a/public/c++/VectorPairHMM/JNI_README b/public/VectorPairHMM/src/main/c++/JNI_README
similarity index 100%
rename from public/c++/VectorPairHMM/JNI_README
rename to public/VectorPairHMM/src/main/c++/JNI_README
diff --git a/public/c++/VectorPairHMM/LoadTimeInitializer.cc b/public/VectorPairHMM/src/main/c++/LoadTimeInitializer.cc
similarity index 100%
rename from public/c++/VectorPairHMM/LoadTimeInitializer.cc
rename to public/VectorPairHMM/src/main/c++/LoadTimeInitializer.cc
diff --git a/public/c++/VectorPairHMM/LoadTimeInitializer.h b/public/VectorPairHMM/src/main/c++/LoadTimeInitializer.h
similarity index 100%
rename from public/c++/VectorPairHMM/LoadTimeInitializer.h
rename to public/VectorPairHMM/src/main/c++/LoadTimeInitializer.h
diff --git a/public/c++/VectorPairHMM/Makefile b/public/VectorPairHMM/src/main/c++/Makefile
similarity index 95%
rename from public/c++/VectorPairHMM/Makefile
rename to public/VectorPairHMM/src/main/c++/Makefile
index f88b38401..e1e443d2e 100644
--- a/public/c++/VectorPairHMM/Makefile
+++ b/public/VectorPairHMM/src/main/c++/Makefile
@@ -4,8 +4,8 @@
 #CFLAGS=-O2 -std=c++11 -W -Wall -march=corei7-avx -Wa,-q            -pedantic $(OMPCFLAGS) -Wno-unknown-pragmas
 #CFLAGS=-O2             -W -Wall -march=corei7 -mfpmath=sse -msse4.2 -pedantic $(OMPCFLAGS) -Wno-unknown-pragmas
 
-JAVA_ROOT=/opt/jdk1.7.0_25/
-JNI_COMPILATION_FLAGS=-D_REENTRANT -fPIC -I${JAVA_ROOT}/include -I${JAVA_ROOT}/include/linux
+JRE_HOME?=/opt/jdk1.7.0_25/
+JNI_COMPILATION_FLAGS=-D_REENTRANT -fPIC -I${JRE_HOME}/../include -I${JRE_HOME}/../include/linux
 
 COMMON_COMPILATION_FLAGS=$(JNI_COMPILATION_FLAGS) -O3 -W -Wall -pedantic $(OMPCFLAGS) -Wno-unknown-pragmas
 CC=icc
diff --git a/public/c++/VectorPairHMM/Sandbox.cc b/public/VectorPairHMM/src/main/c++/Sandbox.cc
similarity index 100%
rename from public/c++/VectorPairHMM/Sandbox.cc
rename to public/VectorPairHMM/src/main/c++/Sandbox.cc
diff --git a/public/c++/VectorPairHMM/Sandbox.h b/public/VectorPairHMM/src/main/c++/Sandbox.h
similarity index 100%
rename from public/c++/VectorPairHMM/Sandbox.h
rename to public/VectorPairHMM/src/main/c++/Sandbox.h
diff --git a/public/c++/VectorPairHMM/Sandbox.java b/public/VectorPairHMM/src/main/c++/Sandbox.java
similarity index 100%
rename from public/c++/VectorPairHMM/Sandbox.java
rename to public/VectorPairHMM/src/main/c++/Sandbox.java
diff --git a/public/c++/VectorPairHMM/Sandbox_JNIHaplotypeDataHolderClass.h b/public/VectorPairHMM/src/main/c++/Sandbox_JNIHaplotypeDataHolderClass.h
similarity index 100%
rename from public/c++/VectorPairHMM/Sandbox_JNIHaplotypeDataHolderClass.h
rename to public/VectorPairHMM/src/main/c++/Sandbox_JNIHaplotypeDataHolderClass.h
diff --git a/public/c++/VectorPairHMM/Sandbox_JNIReadDataHolderClass.h b/public/VectorPairHMM/src/main/c++/Sandbox_JNIReadDataHolderClass.h
similarity index 100%
rename from public/c++/VectorPairHMM/Sandbox_JNIReadDataHolderClass.h
rename to public/VectorPairHMM/src/main/c++/Sandbox_JNIReadDataHolderClass.h
diff --git a/public/c++/VectorPairHMM/avx_function_instantiations.cc b/public/VectorPairHMM/src/main/c++/avx_function_instantiations.cc
similarity index 100%
rename from public/c++/VectorPairHMM/avx_function_instantiations.cc
rename to public/VectorPairHMM/src/main/c++/avx_function_instantiations.cc
diff --git a/public/c++/VectorPairHMM/baseline.cc b/public/VectorPairHMM/src/main/c++/baseline.cc
similarity index 100%
rename from public/c++/VectorPairHMM/baseline.cc
rename to public/VectorPairHMM/src/main/c++/baseline.cc
diff --git a/public/c++/VectorPairHMM/define-double.h b/public/VectorPairHMM/src/main/c++/define-double.h
similarity index 100%
rename from public/c++/VectorPairHMM/define-double.h
rename to public/VectorPairHMM/src/main/c++/define-double.h
diff --git a/public/c++/VectorPairHMM/define-float.h b/public/VectorPairHMM/src/main/c++/define-float.h
similarity index 100%
rename from public/c++/VectorPairHMM/define-float.h
rename to public/VectorPairHMM/src/main/c++/define-float.h
diff --git a/public/c++/VectorPairHMM/define-sse-double.h b/public/VectorPairHMM/src/main/c++/define-sse-double.h
similarity index 100%
rename from public/c++/VectorPairHMM/define-sse-double.h
rename to public/VectorPairHMM/src/main/c++/define-sse-double.h
diff --git a/public/c++/VectorPairHMM/define-sse-float.h b/public/VectorPairHMM/src/main/c++/define-sse-float.h
similarity index 100%
rename from public/c++/VectorPairHMM/define-sse-float.h
rename to public/VectorPairHMM/src/main/c++/define-sse-float.h
diff --git a/public/c++/VectorPairHMM/headers.h b/public/VectorPairHMM/src/main/c++/headers.h
similarity index 100%
rename from public/c++/VectorPairHMM/headers.h
rename to public/VectorPairHMM/src/main/c++/headers.h
diff --git a/public/c++/VectorPairHMM/jni_common.h b/public/VectorPairHMM/src/main/c++/jni_common.h
similarity index 100%
rename from public/c++/VectorPairHMM/jni_common.h
rename to public/VectorPairHMM/src/main/c++/jni_common.h
diff --git a/public/c++/VectorPairHMM/jnidebug.h b/public/VectorPairHMM/src/main/c++/jnidebug.h
similarity index 100%
rename from public/c++/VectorPairHMM/jnidebug.h
rename to public/VectorPairHMM/src/main/c++/jnidebug.h
diff --git a/public/c++/VectorPairHMM/org_broadinstitute_sting_utils_pairhmm_DebugJNILoglessPairHMM.cc b/public/VectorPairHMM/src/main/c++/org_broadinstitute_sting_utils_pairhmm_DebugJNILoglessPairHMM.cc
similarity index 100%
rename from public/c++/VectorPairHMM/org_broadinstitute_sting_utils_pairhmm_DebugJNILoglessPairHMM.cc
rename to public/VectorPairHMM/src/main/c++/org_broadinstitute_sting_utils_pairhmm_DebugJNILoglessPairHMM.cc
diff --git a/public/c++/VectorPairHMM/org_broadinstitute_sting_utils_pairhmm_DebugJNILoglessPairHMM.h b/public/VectorPairHMM/src/main/c++/org_broadinstitute_sting_utils_pairhmm_DebugJNILoglessPairHMM.h
similarity index 100%
rename from public/c++/VectorPairHMM/org_broadinstitute_sting_utils_pairhmm_DebugJNILoglessPairHMM.h
rename to public/VectorPairHMM/src/main/c++/org_broadinstitute_sting_utils_pairhmm_DebugJNILoglessPairHMM.h
diff --git a/public/c++/VectorPairHMM/org_broadinstitute_sting_utils_pairhmm_VectorLoglessPairHMM.cc b/public/VectorPairHMM/src/main/c++/org_broadinstitute_sting_utils_pairhmm_VectorLoglessPairHMM.cc
similarity index 100%
rename from public/c++/VectorPairHMM/org_broadinstitute_sting_utils_pairhmm_VectorLoglessPairHMM.cc
rename to public/VectorPairHMM/src/main/c++/org_broadinstitute_sting_utils_pairhmm_VectorLoglessPairHMM.cc
diff --git a/public/c++/VectorPairHMM/org_broadinstitute_sting_utils_pairhmm_VectorLoglessPairHMM.h b/public/VectorPairHMM/src/main/c++/org_broadinstitute_sting_utils_pairhmm_VectorLoglessPairHMM.h
similarity index 100%
rename from public/c++/VectorPairHMM/org_broadinstitute_sting_utils_pairhmm_VectorLoglessPairHMM.h
rename to public/VectorPairHMM/src/main/c++/org_broadinstitute_sting_utils_pairhmm_VectorLoglessPairHMM.h
diff --git a/public/c++/VectorPairHMM/pairhmm-1-base.cc b/public/VectorPairHMM/src/main/c++/pairhmm-1-base.cc
similarity index 100%
rename from public/c++/VectorPairHMM/pairhmm-1-base.cc
rename to public/VectorPairHMM/src/main/c++/pairhmm-1-base.cc
diff --git a/public/c++/VectorPairHMM/pairhmm-template-kernel.cc b/public/VectorPairHMM/src/main/c++/pairhmm-template-kernel.cc
similarity index 100%
rename from public/c++/VectorPairHMM/pairhmm-template-kernel.cc
rename to public/VectorPairHMM/src/main/c++/pairhmm-template-kernel.cc
diff --git a/public/c++/VectorPairHMM/pairhmm-template-main.cc b/public/VectorPairHMM/src/main/c++/pairhmm-template-main.cc
similarity index 100%
rename from public/c++/VectorPairHMM/pairhmm-template-main.cc
rename to public/VectorPairHMM/src/main/c++/pairhmm-template-main.cc
diff --git a/public/c++/VectorPairHMM/run.sh b/public/VectorPairHMM/src/main/c++/run.sh
similarity index 100%
rename from public/c++/VectorPairHMM/run.sh
rename to public/VectorPairHMM/src/main/c++/run.sh
diff --git a/public/c++/VectorPairHMM/shift_template.c b/public/VectorPairHMM/src/main/c++/shift_template.c
similarity index 100%
rename from public/c++/VectorPairHMM/shift_template.c
rename to public/VectorPairHMM/src/main/c++/shift_template.c
diff --git a/public/c++/VectorPairHMM/sse_function_instantiations.cc b/public/VectorPairHMM/src/main/c++/sse_function_instantiations.cc
similarity index 100%
rename from public/c++/VectorPairHMM/sse_function_instantiations.cc
rename to public/VectorPairHMM/src/main/c++/sse_function_instantiations.cc
diff --git a/public/c++/VectorPairHMM/template.h b/public/VectorPairHMM/src/main/c++/template.h
similarity index 100%
rename from public/c++/VectorPairHMM/template.h
rename to public/VectorPairHMM/src/main/c++/template.h
diff --git a/public/c++/VectorPairHMM/utils.cc b/public/VectorPairHMM/src/main/c++/utils.cc
similarity index 100%
rename from public/c++/VectorPairHMM/utils.cc
rename to public/VectorPairHMM/src/main/c++/utils.cc
diff --git a/public/c++/VectorPairHMM/utils.h b/public/VectorPairHMM/src/main/c++/utils.h
similarity index 100%
rename from public/c++/VectorPairHMM/utils.h
rename to public/VectorPairHMM/src/main/c++/utils.h
diff --git a/public/c++/VectorPairHMM/vector_defs.h b/public/VectorPairHMM/src/main/c++/vector_defs.h
similarity index 100%
rename from public/c++/VectorPairHMM/vector_defs.h
rename to public/VectorPairHMM/src/main/c++/vector_defs.h
diff --git a/public/c++/VectorPairHMM/vector_function_prototypes.h b/public/VectorPairHMM/src/main/c++/vector_function_prototypes.h
similarity index 100%
rename from public/c++/VectorPairHMM/vector_function_prototypes.h
rename to public/VectorPairHMM/src/main/c++/vector_function_prototypes.h