diff --git a/GNUmakefile b/GNUmakefile
index 00fe0db..b1a5b76 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -40,6 +40,6 @@ export RTE_SDK
 # directory list
 #
 
-ROOTDIRS-y := buildtools lib drivers app
+ROOTDIRS-y := buildtools lib drivers app test
 
 include $(RTE_SDK)/mk/rte.sdkroot.mk
diff --git a/app/Makefile b/app/Makefile
index 1a974a5..4b3a448 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -31,12 +31,8 @@
 
 include $(RTE_SDK)/mk/rte.vars.mk
 
-DIRS-$(CONFIG_RTE_APP_TEST) += test
-DIRS-$(CONFIG_RTE_LIBRTE_ACL) += test-acl
-DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test-pipeline
 DIRS-$(CONFIG_RTE_TEST_PMD) += test-pmd
 DIRS-$(CONFIG_RTE_APP_CRYPTO_PERF) += test-crypto-perf
-DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_test
 DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += proc_info
 DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += pdump
 
diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk
index ddbbbf6..1cdb40b 100644
--- a/mk/rte.sdktest.mk
+++ b/mk/rte.sdktest.mk
@@ -57,7 +57,7 @@ test fast_test perf_test:
 	@mkdir -p $(AUTOTEST_DIR) ; \
 	cd $(AUTOTEST_DIR) ; \
 	if [ -f $(RTE_OUTPUT)/app/test ]; then \
-		python $(RTE_SDK)/app/test/autotest.py \
+		python $(RTE_SDK)/test/test/autotest.py \
 			$(RTE_OUTPUT)/app/test \
 			$(RTE_TARGET) \
 			$(BLACKLIST) $(WHITELIST); \
@@ -71,10 +71,10 @@ coverage:
 	@mkdir -p $(AUTOTEST_DIR) ; \
 	cd $(AUTOTEST_DIR) ; \
 	if [ -f $(RTE_OUTPUT)/app/test ]; then \
-		python $(RTE_SDK)/app/cmdline_test/cmdline_test.py \
+		python $(RTE_SDK)/test/cmdline_test/cmdline_test.py \
 			$(RTE_OUTPUT)/app/cmdline_test; \
 		ulimit -S -n 100 ; \
-		python $(RTE_SDK)/app/test/autotest.py \
+		python $(RTE_SDK)/test/test/autotest.py \
 			$(RTE_OUTPUT)/app/test \
 			$(RTE_TARGET) \
 			$(BLACKLIST) $(WHITELIST) ; \
diff --git a/test/Makefile b/test/Makefile
new file mode 100644
index 0000000..e996fd8
--- /dev/null
+++ b/test/Makefile
@@ -0,0 +1,39 @@
+#   BSD LICENSE
+#
+#   Copyright(c) 2017 Intel Corporation. All rights reserved.
+#   All rights reserved.
+#
+#   Redistribution and use in source and binary forms, with or without
+#   modification, are permitted provided that the following conditions
+#   are met:
+#
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in
+#       the documentation and/or other materials provided with the
+#       distribution.
+#     * Neither the name of Intel Corporation nor the names of its
+#       contributors may be used to endorse or promote products derived
+#       from this software without specific prior written permission.
+#
+#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+#   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+#   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+#   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+include $(RTE_SDK)/mk/rte.vars.mk
+
+DIRS-$(CONFIG_RTE_APP_TEST) += test
+DIRS-$(CONFIG_RTE_LIBRTE_ACL) += test-acl
+DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test-pipeline
+DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_test
+
+include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/app/cmdline_test/Makefile b/test/cmdline_test/Makefile
similarity index 100%
rename from app/cmdline_test/Makefile
rename to test/cmdline_test/Makefile
diff --git a/app/cmdline_test/cmdline_test.c b/test/cmdline_test/cmdline_test.c
similarity index 100%
rename from app/cmdline_test/cmdline_test.c
rename to test/cmdline_test/cmdline_test.c
diff --git a/app/cmdline_test/cmdline_test.h b/test/cmdline_test/cmdline_test.h
similarity index 100%
rename from app/cmdline_test/cmdline_test.h
rename to test/cmdline_test/cmdline_test.h
diff --git a/app/cmdline_test/cmdline_test.py b/test/cmdline_test/cmdline_test.py
similarity index 100%
rename from app/cmdline_test/cmdline_test.py
rename to test/cmdline_test/cmdline_test.py
diff --git a/app/cmdline_test/cmdline_test_data.py b/test/cmdline_test/cmdline_test_data.py
similarity index 100%
rename from app/cmdline_test/cmdline_test_data.py
rename to test/cmdline_test/cmdline_test_data.py
diff --git a/app/cmdline_test/commands.c b/test/cmdline_test/commands.c
similarity index 100%
rename from app/cmdline_test/commands.c
rename to test/cmdline_test/commands.c
diff --git a/app/test-acl/Makefile b/test/test-acl/Makefile
similarity index 100%
rename from app/test-acl/Makefile
rename to test/test-acl/Makefile
diff --git a/app/test-acl/main.c b/test/test-acl/main.c
similarity index 100%
rename from app/test-acl/main.c
rename to test/test-acl/main.c
diff --git a/app/test-pipeline/Makefile b/test/test-pipeline/Makefile
similarity index 100%
rename from app/test-pipeline/Makefile
rename to test/test-pipeline/Makefile
diff --git a/app/test-pipeline/config.c b/test/test-pipeline/config.c
similarity index 100%
rename from app/test-pipeline/config.c
rename to test/test-pipeline/config.c
diff --git a/app/test-pipeline/init.c b/test/test-pipeline/init.c
similarity index 100%
rename from app/test-pipeline/init.c
rename to test/test-pipeline/init.c
diff --git a/app/test-pipeline/main.c b/test/test-pipeline/main.c
similarity index 100%
rename from app/test-pipeline/main.c
rename to test/test-pipeline/main.c
diff --git a/app/test-pipeline/main.h b/test/test-pipeline/main.h
similarity index 100%
rename from app/test-pipeline/main.h
rename to test/test-pipeline/main.h
diff --git a/app/test-pipeline/pipeline_acl.c b/test/test-pipeline/pipeline_acl.c
similarity index 100%
rename from app/test-pipeline/pipeline_acl.c
rename to test/test-pipeline/pipeline_acl.c
diff --git a/app/test-pipeline/pipeline_hash.c b/test/test-pipeline/pipeline_hash.c
similarity index 100%
rename from app/test-pipeline/pipeline_hash.c
rename to test/test-pipeline/pipeline_hash.c
diff --git a/app/test-pipeline/pipeline_lpm.c b/test/test-pipeline/pipeline_lpm.c
similarity index 100%
rename from app/test-pipeline/pipeline_lpm.c
rename to test/test-pipeline/pipeline_lpm.c
diff --git a/app/test-pipeline/pipeline_lpm_ipv6.c b/test/test-pipeline/pipeline_lpm_ipv6.c
similarity index 100%
rename from app/test-pipeline/pipeline_lpm_ipv6.c
rename to test/test-pipeline/pipeline_lpm_ipv6.c
diff --git a/app/test-pipeline/pipeline_stub.c b/test/test-pipeline/pipeline_stub.c
similarity index 100%
rename from app/test-pipeline/pipeline_stub.c
rename to test/test-pipeline/pipeline_stub.c
diff --git a/app/test-pipeline/runtime.c b/test/test-pipeline/runtime.c
similarity index 100%
rename from app/test-pipeline/runtime.c
rename to test/test-pipeline/runtime.c
diff --git a/app/test/Makefile b/test/test/Makefile
similarity index 100%
rename from app/test/Makefile
rename to test/test/Makefile
diff --git a/app/test/autotest.py b/test/test/autotest.py
similarity index 100%
rename from app/test/autotest.py
rename to test/test/autotest.py
diff --git a/app/test/autotest_data.py b/test/test/autotest_data.py
similarity index 100%
rename from app/test/autotest_data.py
rename to test/test/autotest_data.py
diff --git a/app/test/autotest_runner.py b/test/test/autotest_runner.py
similarity index 100%
rename from app/test/autotest_runner.py
rename to test/test/autotest_runner.py
diff --git a/app/test/autotest_test_funcs.py b/test/test/autotest_test_funcs.py
similarity index 100%
rename from app/test/autotest_test_funcs.py
rename to test/test/autotest_test_funcs.py
diff --git a/app/test/commands.c b/test/test/commands.c
similarity index 100%
rename from app/test/commands.c
rename to test/test/commands.c
diff --git a/app/test/packet_burst_generator.c b/test/test/packet_burst_generator.c
similarity index 100%
rename from app/test/packet_burst_generator.c
rename to test/test/packet_burst_generator.c
diff --git a/app/test/packet_burst_generator.h b/test/test/packet_burst_generator.h
similarity index 100%
rename from app/test/packet_burst_generator.h
rename to test/test/packet_burst_generator.h
diff --git a/app/test/process.h b/test/test/process.h
similarity index 100%
rename from app/test/process.h
rename to test/test/process.h
diff --git a/app/test/resource.c b/test/test/resource.c
similarity index 100%
rename from app/test/resource.c
rename to test/test/resource.c
diff --git a/app/test/resource.h b/test/test/resource.h
similarity index 100%
rename from app/test/resource.h
rename to test/test/resource.h
diff --git a/app/test/test.c b/test/test/test.c
similarity index 100%
rename from app/test/test.c
rename to test/test/test.c
diff --git a/app/test/test.h b/test/test/test.h
similarity index 100%
rename from app/test/test.h
rename to test/test/test.h
diff --git a/app/test/test_acl.c b/test/test/test_acl.c
similarity index 100%
rename from app/test/test_acl.c
rename to test/test/test_acl.c
diff --git a/app/test/test_acl.h b/test/test/test_acl.h
similarity index 100%
rename from app/test/test_acl.h
rename to test/test/test_acl.h
diff --git a/app/test/test_alarm.c b/test/test/test_alarm.c
similarity index 100%
rename from app/test/test_alarm.c
rename to test/test/test_alarm.c
diff --git a/app/test/test_atomic.c b/test/test/test_atomic.c
similarity index 100%
rename from app/test/test_atomic.c
rename to test/test/test_atomic.c
diff --git a/app/test/test_byteorder.c b/test/test/test_byteorder.c
similarity index 100%
rename from app/test/test_byteorder.c
rename to test/test/test_byteorder.c
diff --git a/app/test/test_cmdline.c b/test/test/test_cmdline.c
similarity index 100%
rename from app/test/test_cmdline.c
rename to test/test/test_cmdline.c
diff --git a/app/test/test_cmdline.h b/test/test/test_cmdline.h
similarity index 100%
rename from app/test/test_cmdline.h
rename to test/test/test_cmdline.h
diff --git a/app/test/test_cmdline_cirbuf.c b/test/test/test_cmdline_cirbuf.c
similarity index 100%
rename from app/test/test_cmdline_cirbuf.c
rename to test/test/test_cmdline_cirbuf.c
diff --git a/app/test/test_cmdline_etheraddr.c b/test/test/test_cmdline_etheraddr.c
similarity index 100%
rename from app/test/test_cmdline_etheraddr.c
rename to test/test/test_cmdline_etheraddr.c
diff --git a/app/test/test_cmdline_ipaddr.c b/test/test/test_cmdline_ipaddr.c
similarity index 100%
rename from app/test/test_cmdline_ipaddr.c
rename to test/test/test_cmdline_ipaddr.c
diff --git a/app/test/test_cmdline_lib.c b/test/test/test_cmdline_lib.c
similarity index 100%
rename from app/test/test_cmdline_lib.c
rename to test/test/test_cmdline_lib.c
diff --git a/app/test/test_cmdline_num.c b/test/test/test_cmdline_num.c
similarity index 100%
rename from app/test/test_cmdline_num.c
rename to test/test/test_cmdline_num.c
diff --git a/app/test/test_cmdline_portlist.c b/test/test/test_cmdline_portlist.c
similarity index 100%
rename from app/test/test_cmdline_portlist.c
rename to test/test/test_cmdline_portlist.c
diff --git a/app/test/test_cmdline_string.c b/test/test/test_cmdline_string.c
similarity index 100%
rename from app/test/test_cmdline_string.c
rename to test/test/test_cmdline_string.c
diff --git a/app/test/test_common.c b/test/test/test_common.c
similarity index 100%
rename from app/test/test_common.c
rename to test/test/test_common.c
diff --git a/app/test/test_cpuflags.c b/test/test/test_cpuflags.c
similarity index 100%
rename from app/test/test_cpuflags.c
rename to test/test/test_cpuflags.c
diff --git a/app/test/test_cryptodev.c b/test/test/test_cryptodev.c
similarity index 100%
rename from app/test/test_cryptodev.c
rename to test/test/test_cryptodev.c
diff --git a/app/test/test_cryptodev.h b/test/test/test_cryptodev.h
similarity index 100%
rename from app/test/test_cryptodev.h
rename to test/test/test_cryptodev.h
diff --git a/app/test/test_cryptodev_aes_test_vectors.h b/test/test/test_cryptodev_aes_test_vectors.h
similarity index 100%
rename from app/test/test_cryptodev_aes_test_vectors.h
rename to test/test/test_cryptodev_aes_test_vectors.h
diff --git a/app/test/test_cryptodev_blockcipher.c b/test/test/test_cryptodev_blockcipher.c
similarity index 100%
rename from app/test/test_cryptodev_blockcipher.c
rename to test/test/test_cryptodev_blockcipher.c
diff --git a/app/test/test_cryptodev_blockcipher.h b/test/test/test_cryptodev_blockcipher.h
similarity index 100%
rename from app/test/test_cryptodev_blockcipher.h
rename to test/test/test_cryptodev_blockcipher.h
diff --git a/app/test/test_cryptodev_des_test_vectors.h b/test/test/test_cryptodev_des_test_vectors.h
similarity index 100%
rename from app/test/test_cryptodev_des_test_vectors.h
rename to test/test/test_cryptodev_des_test_vectors.h
diff --git a/app/test/test_cryptodev_gcm_test_vectors.h b/test/test/test_cryptodev_gcm_test_vectors.h
similarity index 100%
rename from app/test/test_cryptodev_gcm_test_vectors.h
rename to test/test/test_cryptodev_gcm_test_vectors.h
diff --git a/app/test/test_cryptodev_hash_test_vectors.h b/test/test/test_cryptodev_hash_test_vectors.h
similarity index 100%
rename from app/test/test_cryptodev_hash_test_vectors.h
rename to test/test/test_cryptodev_hash_test_vectors.h
diff --git a/app/test/test_cryptodev_hmac_test_vectors.h b/test/test/test_cryptodev_hmac_test_vectors.h
similarity index 100%
rename from app/test/test_cryptodev_hmac_test_vectors.h
rename to test/test/test_cryptodev_hmac_test_vectors.h
diff --git a/app/test/test_cryptodev_kasumi_hash_test_vectors.h b/test/test/test_cryptodev_kasumi_hash_test_vectors.h
similarity index 100%
rename from app/test/test_cryptodev_kasumi_hash_test_vectors.h
rename to test/test/test_cryptodev_kasumi_hash_test_vectors.h
diff --git a/app/test/test_cryptodev_kasumi_test_vectors.h b/test/test/test_cryptodev_kasumi_test_vectors.h
similarity index 100%
rename from app/test/test_cryptodev_kasumi_test_vectors.h
rename to test/test/test_cryptodev_kasumi_test_vectors.h
diff --git a/app/test/test_cryptodev_perf.c b/test/test/test_cryptodev_perf.c
similarity index 100%
rename from app/test/test_cryptodev_perf.c
rename to test/test/test_cryptodev_perf.c
diff --git a/app/test/test_cryptodev_snow3g_hash_test_vectors.h b/test/test/test_cryptodev_snow3g_hash_test_vectors.h
similarity index 100%
rename from app/test/test_cryptodev_snow3g_hash_test_vectors.h
rename to test/test/test_cryptodev_snow3g_hash_test_vectors.h
diff --git a/app/test/test_cryptodev_snow3g_test_vectors.h b/test/test/test_cryptodev_snow3g_test_vectors.h
similarity index 100%
rename from app/test/test_cryptodev_snow3g_test_vectors.h
rename to test/test/test_cryptodev_snow3g_test_vectors.h
diff --git a/app/test/test_cryptodev_zuc_hash_test_vectors.h b/test/test/test_cryptodev_zuc_hash_test_vectors.h
similarity index 100%
rename from app/test/test_cryptodev_zuc_hash_test_vectors.h
rename to test/test/test_cryptodev_zuc_hash_test_vectors.h
diff --git a/app/test/test_cryptodev_zuc_test_vectors.h b/test/test/test_cryptodev_zuc_test_vectors.h
similarity index 100%
rename from app/test/test_cryptodev_zuc_test_vectors.h
rename to test/test/test_cryptodev_zuc_test_vectors.h
diff --git a/app/test/test_cycles.c b/test/test/test_cycles.c
similarity index 100%
rename from app/test/test_cycles.c
rename to test/test/test_cycles.c
diff --git a/app/test/test_debug.c b/test/test/test_debug.c
similarity index 100%
rename from app/test/test_debug.c
rename to test/test/test_debug.c
diff --git a/app/test/test_devargs.c b/test/test/test_devargs.c
similarity index 100%
rename from app/test/test_devargs.c
rename to test/test/test_devargs.c
diff --git a/app/test/test_distributor.c b/test/test/test_distributor.c
similarity index 100%
rename from app/test/test_distributor.c
rename to test/test/test_distributor.c
diff --git a/app/test/test_distributor_perf.c b/test/test/test_distributor_perf.c
similarity index 100%
rename from app/test/test_distributor_perf.c
rename to test/test/test_distributor_perf.c
diff --git a/app/test/test_eal_flags.c b/test/test/test_eal_flags.c
similarity index 100%
rename from app/test/test_eal_flags.c
rename to test/test/test_eal_flags.c
diff --git a/app/test/test_eal_fs.c b/test/test/test_eal_fs.c
similarity index 100%
rename from app/test/test_eal_fs.c
rename to test/test/test_eal_fs.c
diff --git a/app/test/test_efd.c b/test/test/test_efd.c
similarity index 100%
rename from app/test/test_efd.c
rename to test/test/test_efd.c
diff --git a/app/test/test_efd_perf.c b/test/test/test_efd_perf.c
similarity index 100%
rename from app/test/test_efd_perf.c
rename to test/test/test_efd_perf.c
diff --git a/app/test/test_errno.c b/test/test/test_errno.c
similarity index 100%
rename from app/test/test_errno.c
rename to test/test/test_errno.c
diff --git a/app/test/test_func_reentrancy.c b/test/test/test_func_reentrancy.c
similarity index 100%
rename from app/test/test_func_reentrancy.c
rename to test/test/test_func_reentrancy.c
diff --git a/app/test/test_hash.c b/test/test/test_hash.c
similarity index 100%
rename from app/test/test_hash.c
rename to test/test/test_hash.c
diff --git a/app/test/test_hash_functions.c b/test/test/test_hash_functions.c
similarity index 100%
rename from app/test/test_hash_functions.c
rename to test/test/test_hash_functions.c
diff --git a/app/test/test_hash_multiwriter.c b/test/test/test_hash_multiwriter.c
similarity index 100%
rename from app/test/test_hash_multiwriter.c
rename to test/test/test_hash_multiwriter.c
diff --git a/app/test/test_hash_perf.c b/test/test/test_hash_perf.c
similarity index 100%
rename from app/test/test_hash_perf.c
rename to test/test/test_hash_perf.c
diff --git a/app/test/test_hash_scaling.c b/test/test/test_hash_scaling.c
similarity index 100%
rename from app/test/test_hash_scaling.c
rename to test/test/test_hash_scaling.c
diff --git a/app/test/test_interrupts.c b/test/test/test_interrupts.c
similarity index 100%
rename from app/test/test_interrupts.c
rename to test/test/test_interrupts.c
diff --git a/app/test/test_kni.c b/test/test/test_kni.c
similarity index 100%
rename from app/test/test_kni.c
rename to test/test/test_kni.c
diff --git a/app/test/test_kvargs.c b/test/test/test_kvargs.c
similarity index 100%
rename from app/test/test_kvargs.c
rename to test/test/test_kvargs.c
diff --git a/app/test/test_link_bonding.c b/test/test/test_link_bonding.c
similarity index 100%
rename from app/test/test_link_bonding.c
rename to test/test/test_link_bonding.c
diff --git a/app/test/test_link_bonding_mode4.c b/test/test/test_link_bonding_mode4.c
similarity index 100%
rename from app/test/test_link_bonding_mode4.c
rename to test/test/test_link_bonding_mode4.c
diff --git a/app/test/test_link_bonding_rssconf.c b/test/test/test_link_bonding_rssconf.c
similarity index 100%
rename from app/test/test_link_bonding_rssconf.c
rename to test/test/test_link_bonding_rssconf.c
diff --git a/app/test/test_logs.c b/test/test/test_logs.c
similarity index 100%
rename from app/test/test_logs.c
rename to test/test/test_logs.c
diff --git a/app/test/test_lpm.c b/test/test/test_lpm.c
similarity index 100%
rename from app/test/test_lpm.c
rename to test/test/test_lpm.c
diff --git a/app/test/test_lpm6.c b/test/test/test_lpm6.c
similarity index 100%
rename from app/test/test_lpm6.c
rename to test/test/test_lpm6.c
diff --git a/app/test/test_lpm6_data.h b/test/test/test_lpm6_data.h
similarity index 100%
rename from app/test/test_lpm6_data.h
rename to test/test/test_lpm6_data.h
diff --git a/app/test/test_lpm6_perf.c b/test/test/test_lpm6_perf.c
similarity index 100%
rename from app/test/test_lpm6_perf.c
rename to test/test/test_lpm6_perf.c
diff --git a/app/test/test_lpm_perf.c b/test/test/test_lpm_perf.c
similarity index 100%
rename from app/test/test_lpm_perf.c
rename to test/test/test_lpm_perf.c
diff --git a/app/test/test_malloc.c b/test/test/test_malloc.c
similarity index 100%
rename from app/test/test_malloc.c
rename to test/test/test_malloc.c
diff --git a/app/test/test_mbuf.c b/test/test/test_mbuf.c
similarity index 100%
rename from app/test/test_mbuf.c
rename to test/test/test_mbuf.c
diff --git a/app/test/test_memcpy.c b/test/test/test_memcpy.c
similarity index 100%
rename from app/test/test_memcpy.c
rename to test/test/test_memcpy.c
diff --git a/app/test/test_memcpy_perf.c b/test/test/test_memcpy_perf.c
similarity index 100%
rename from app/test/test_memcpy_perf.c
rename to test/test/test_memcpy_perf.c
diff --git a/app/test/test_memory.c b/test/test/test_memory.c
similarity index 100%
rename from app/test/test_memory.c
rename to test/test/test_memory.c
diff --git a/app/test/test_mempool.c b/test/test/test_mempool.c
similarity index 100%
rename from app/test/test_mempool.c
rename to test/test/test_mempool.c
diff --git a/app/test/test_mempool_perf.c b/test/test/test_mempool_perf.c
similarity index 100%
rename from app/test/test_mempool_perf.c
rename to test/test/test_mempool_perf.c
diff --git a/app/test/test_memzone.c b/test/test/test_memzone.c
similarity index 100%
rename from app/test/test_memzone.c
rename to test/test/test_memzone.c
diff --git a/app/test/test_meter.c b/test/test/test_meter.c
similarity index 100%
rename from app/test/test_meter.c
rename to test/test/test_meter.c
diff --git a/app/test/test_mp_secondary.c b/test/test/test_mp_secondary.c
similarity index 100%
rename from app/test/test_mp_secondary.c
rename to test/test/test_mp_secondary.c
diff --git a/app/test/test_pci.c b/test/test/test_pci.c
similarity index 100%
rename from app/test/test_pci.c
rename to test/test/test_pci.c
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/class b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/class
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/class
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/class
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/config b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/config
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/config
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/config
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/consistent_dma_mask_bits b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/consistent_dma_mask_bits
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/consistent_dma_mask_bits
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/consistent_dma_mask_bits
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/device b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/device
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/device
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/device
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/dma_mask_bits b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/dma_mask_bits
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/dma_mask_bits
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/dma_mask_bits
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/enable b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/enable
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/enable
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/enable
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/irq b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/irq
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/irq
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/irq
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/modalias b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/modalias
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/modalias
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/modalias
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/msi_bus b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/msi_bus
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/msi_bus
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/msi_bus
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/numa_node b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/numa_node
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/numa_node
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/numa_node
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/resource b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/resource
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/resource
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/resource
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/sriov_numvfs b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/sriov_numvfs
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/sriov_numvfs
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/sriov_numvfs
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/sriov_totalvfs b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/sriov_totalvfs
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/sriov_totalvfs
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/sriov_totalvfs
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/subsystem_device b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/subsystem_device
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/subsystem_device
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/subsystem_device
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/subsystem_vendor b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/subsystem_vendor
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/subsystem_vendor
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/subsystem_vendor
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/uevent b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/uevent
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/uevent
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/uevent
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/vendor b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/vendor
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/vendor
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/vendor
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/class b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/class
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/class
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/class
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/device b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/device
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/device
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/device
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/resource b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/resource
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/resource
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/resource
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/subsystem_device b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/subsystem_device
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/subsystem_device
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/subsystem_device
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/subsystem_vendor b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/subsystem_vendor
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/subsystem_vendor
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/subsystem_vendor
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/vendor b/test/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/vendor
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/vendor
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/vendor
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/class b/test/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/class
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/class
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/class
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/device b/test/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/device
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/device
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/device
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/resource b/test/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/resource
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/resource
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/resource
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/subsystem_device b/test/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/subsystem_device
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/subsystem_device
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/subsystem_device
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/subsystem_vendor b/test/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/subsystem_vendor
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/subsystem_vendor
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/subsystem_vendor
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/vendor b/test/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/vendor
similarity index 100%
rename from app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/vendor
rename to test/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/vendor
diff --git a/app/test/test_per_lcore.c b/test/test/test_per_lcore.c
similarity index 100%
rename from app/test/test_per_lcore.c
rename to test/test/test_per_lcore.c
diff --git a/app/test/test_pmd_perf.c b/test/test/test_pmd_perf.c
similarity index 100%
rename from app/test/test_pmd_perf.c
rename to test/test/test_pmd_perf.c
diff --git a/app/test/test_pmd_ring.c b/test/test/test_pmd_ring.c
similarity index 100%
rename from app/test/test_pmd_ring.c
rename to test/test/test_pmd_ring.c
diff --git a/app/test/test_pmd_ring_perf.c b/test/test/test_pmd_ring_perf.c
similarity index 100%
rename from app/test/test_pmd_ring_perf.c
rename to test/test/test_pmd_ring_perf.c
diff --git a/app/test/test_power.c b/test/test/test_power.c
similarity index 100%
rename from app/test/test_power.c
rename to test/test/test_power.c
diff --git a/app/test/test_power_acpi_cpufreq.c b/test/test/test_power_acpi_cpufreq.c
similarity index 100%
rename from app/test/test_power_acpi_cpufreq.c
rename to test/test/test_power_acpi_cpufreq.c
diff --git a/app/test/test_power_kvm_vm.c b/test/test/test_power_kvm_vm.c
similarity index 100%
rename from app/test/test_power_kvm_vm.c
rename to test/test/test_power_kvm_vm.c
diff --git a/app/test/test_prefetch.c b/test/test/test_prefetch.c
similarity index 100%
rename from app/test/test_prefetch.c
rename to test/test/test_prefetch.c
diff --git a/app/test/test_red.c b/test/test/test_red.c
similarity index 100%
rename from app/test/test_red.c
rename to test/test/test_red.c
diff --git a/app/test/test_reorder.c b/test/test/test_reorder.c
similarity index 100%
rename from app/test/test_reorder.c
rename to test/test/test_reorder.c
diff --git a/app/test/test_resource.c b/test/test/test_resource.c
similarity index 100%
rename from app/test/test_resource.c
rename to test/test/test_resource.c
diff --git a/app/test/test_ring.c b/test/test/test_ring.c
similarity index 100%
rename from app/test/test_ring.c
rename to test/test/test_ring.c
diff --git a/app/test/test_ring_perf.c b/test/test/test_ring_perf.c
similarity index 100%
rename from app/test/test_ring_perf.c
rename to test/test/test_ring_perf.c
diff --git a/app/test/test_rwlock.c b/test/test/test_rwlock.c
similarity index 100%
rename from app/test/test_rwlock.c
rename to test/test/test_rwlock.c
diff --git a/app/test/test_sched.c b/test/test/test_sched.c
similarity index 100%
rename from app/test/test_sched.c
rename to test/test/test_sched.c
diff --git a/app/test/test_spinlock.c b/test/test/test_spinlock.c
similarity index 100%
rename from app/test/test_spinlock.c
rename to test/test/test_spinlock.c
diff --git a/app/test/test_string_fns.c b/test/test/test_string_fns.c
similarity index 100%
rename from app/test/test_string_fns.c
rename to test/test/test_string_fns.c
diff --git a/app/test/test_table.c b/test/test/test_table.c
similarity index 100%
rename from app/test/test_table.c
rename to test/test/test_table.c
diff --git a/app/test/test_table.h b/test/test/test_table.h
similarity index 100%
rename from app/test/test_table.h
rename to test/test/test_table.h
diff --git a/app/test/test_table_acl.c b/test/test/test_table_acl.c
similarity index 100%
rename from app/test/test_table_acl.c
rename to test/test/test_table_acl.c
diff --git a/app/test/test_table_acl.h b/test/test/test_table_acl.h
similarity index 100%
rename from app/test/test_table_acl.h
rename to test/test/test_table_acl.h
diff --git a/app/test/test_table_combined.c b/test/test/test_table_combined.c
similarity index 100%
rename from app/test/test_table_combined.c
rename to test/test/test_table_combined.c
diff --git a/app/test/test_table_combined.h b/test/test/test_table_combined.h
similarity index 100%
rename from app/test/test_table_combined.h
rename to test/test/test_table_combined.h
diff --git a/app/test/test_table_pipeline.c b/test/test/test_table_pipeline.c
similarity index 100%
rename from app/test/test_table_pipeline.c
rename to test/test/test_table_pipeline.c
diff --git a/app/test/test_table_pipeline.h b/test/test/test_table_pipeline.h
similarity index 100%
rename from app/test/test_table_pipeline.h
rename to test/test/test_table_pipeline.h
diff --git a/app/test/test_table_ports.c b/test/test/test_table_ports.c
similarity index 100%
rename from app/test/test_table_ports.c
rename to test/test/test_table_ports.c
diff --git a/app/test/test_table_ports.h b/test/test/test_table_ports.h
similarity index 100%
rename from app/test/test_table_ports.h
rename to test/test/test_table_ports.h
diff --git a/app/test/test_table_tables.c b/test/test/test_table_tables.c
similarity index 100%
rename from app/test/test_table_tables.c
rename to test/test/test_table_tables.c
diff --git a/app/test/test_table_tables.h b/test/test/test_table_tables.h
similarity index 100%
rename from app/test/test_table_tables.h
rename to test/test/test_table_tables.h
diff --git a/app/test/test_tailq.c b/test/test/test_tailq.c
similarity index 100%
rename from app/test/test_tailq.c
rename to test/test/test_tailq.c
diff --git a/app/test/test_thash.c b/test/test/test_thash.c
similarity index 100%
rename from app/test/test_thash.c
rename to test/test/test_thash.c
diff --git a/app/test/test_timer.c b/test/test/test_timer.c
similarity index 100%
rename from app/test/test_timer.c
rename to test/test/test_timer.c
diff --git a/app/test/test_timer_perf.c b/test/test/test_timer_perf.c
similarity index 100%
rename from app/test/test_timer_perf.c
rename to test/test/test_timer_perf.c
diff --git a/app/test/test_timer_racecond.c b/test/test/test_timer_racecond.c
similarity index 100%
rename from app/test/test_timer_racecond.c
rename to test/test/test_timer_racecond.c
diff --git a/app/test/test_version.c b/test/test/test_version.c
similarity index 100%
rename from app/test/test_version.c
rename to test/test/test_version.c
diff --git a/app/test/test_xmmt_ops.h b/test/test/test_xmmt_ops.h
similarity index 100%
rename from app/test/test_xmmt_ops.h
rename to test/test/test_xmmt_ops.h
diff --git a/app/test/virtual_pmd.c b/test/test/virtual_pmd.c
similarity index 100%
rename from app/test/virtual_pmd.c
rename to test/test/virtual_pmd.c
diff --git a/app/test/virtual_pmd.h b/test/test/virtual_pmd.h
similarity index 100%
rename from app/test/virtual_pmd.h
rename to test/test/virtual_pmd.h
