-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Burg/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Fhourstones/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/01-qbsort/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/03-testtrie/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/04-bisect/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/05-eks/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/08-main/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/09-vor/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/12-IOtest/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/15-trie/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/17-bintr/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/McCat/18-imp/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/bh/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/bisort/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/em3d/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/health/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/mst/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/perimeter/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/power/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/treeadd/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/tsp/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Olden/voronoi/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/OptimizerEval/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/anagram/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/bc/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/ft/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/ks/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Ptrdist/yacr2/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/aha/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/llubenchmark/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/sgefa/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/sim/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/Burg/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/aha/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/sgefa/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/01-qbsort/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/03-testtrie/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/04-bisect/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/05-eks/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/08-main/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/09-vor/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/12-IOtest/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/15-trie/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/17-bintr/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/18-imp/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/bh/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/bisort/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/em3d/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/health/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/mst/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/perimeter/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/power/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/OptimizerEval/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/sim/Makefile)