diff --git a/testing/src/dependency-free/apr.ecmp b/base/src/apr.ecmp
similarity index 91%
rename from testing/src/dependency-free/apr.ecmp
rename to base/src/apr.ecmp
index 225ab62..5508b3a 100644
--- a/testing/src/dependency-free/apr.ecmp
+++ b/base/src/apr.ecmp
@@ -7,17 +7,17 @@ url = https://archive.apache.org/dist/apr/apr-1.7.2.tar.bz2
 [description]
  The Apache Portable Runtime (APR) is a supporting library for the Apache web server. It provides a set of application programming interfaces (APIs) that map to the underlying Operating System (OS). Where the OS doesn't support a particular function, APR will provide an emulation. Thus programmers can use the APR to make a program portable across different platforms.
 
+[download]
+curl -L $URL | tar -xj
+
 [install]
-wget $URL 
-tar -xf apr-1.7.2.tar.bz2 
-cd apr-1.7.2 
 sed -e '/^case "$0"/s;$0;$(readlink -f $0);' \
     -i apr-config.in 
 ./configure --prefix=/usr    \
             --disable-static \
             --with-installbuilddir=/usr/share/apr-1/build &&
 make
-make install 
+make install DESTDIR=$BUILD_ROOT
 
 [locations]
 /usr/include/apr-1/ 
diff --git a/testing/src/apr-util.ecmp b/testing/src/apr-util.ecmp
index 199fd2d..532d8f0 100644
--- a/testing/src/apr-util.ecmp
+++ b/testing/src/apr-util.ecmp
@@ -10,17 +10,17 @@ apr
 [description]
 The Apache Portable Runtime Utility Library provides a predictable and consistent interface to underlying client library interfaces. This application programming interface assures predictable if not identical behavior regardless of which libraries are available on a given platform.
 
+[download]
+curl -L $URL | tar -xz
+
 [install]
-wget $URL 
-tar -xf apr-util-1.6.3.tar.bz2
-cd apr-util-1.6.3 
 ./configure --prefix=/usr       \
             --with-apr=/usr     \
             --with-gdbm=/usr    \
             --with-openssl=/usr \
             --with-crypto &&
 make
-make install
+make install DESTDIR=$BUILD_ROOT
 
 [locations]
 /usr/lib/apr-util-1