diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index ec3c04a..0000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-include("xsl_tests.cmake")
-# Test individual parts of the transform
-xsl_golden_test(NAME "attribute-cleanup")
-xsl_golden_test(NAME "composable-interconnect-existing-fasm-mux")
-xsl_golden_test(NAME "composable-interconnect-fasm-mux")
-xsl_golden_test(NAME "composable-interconnect-fasm-mux-levels")
-xsl_golden_test(NAME "composable-interconnect-implicit-parent")
-xsl_golden_test(NAME "composable-interconnect-pack_patterns")
-xsl_golden_test(NAME "composable-loc-implicit-parent")
-add_file_target(FILE "composable-pb_type-inner.xml" SCANNER_TYPE xml)
-add_file_target(FILE "composable-pb_type-middle.xml" SCANNER_TYPE xml)
-xsl_golden_test(NAME "composable-pb_type")
-xsl_golden_test(NAME "explicit-port")
-xsl_golden_test(NAME "pack_pattern-copy-direct-ports")
-xsl_golden_test(NAME "pack_pattern-merge-type-into-name")
-xsl_golden_test(NAME "pack_pattern-strip-from-pb_type-ports")
-xsl_golden_test(NAME "preserve-interconnect")
-# Test everything used together in one big file
-add_file_target(FILE "full-test-inner.xml" SCANNER_TYPE xml)
-xsl_golden_test(NAME "full-test")
diff --git a/attribute-cleanup.golden.xml b/tests/convert_and_merge_composable_tests/attribute-cleanup.golden.xml
similarity index 100%
rename from attribute-cleanup.golden.xml
rename to tests/convert_and_merge_composable_tests/attribute-cleanup.golden.xml
diff --git a/attribute-cleanup.xml b/tests/convert_and_merge_composable_tests/attribute-cleanup.xml
similarity index 100%
rename from attribute-cleanup.xml
rename to tests/convert_and_merge_composable_tests/attribute-cleanup.xml
diff --git a/composable-interconnect-existing-fasm-mux.golden.xml b/tests/convert_and_merge_composable_tests/composable-interconnect-existing-fasm-mux.golden.xml
similarity index 100%
rename from composable-interconnect-existing-fasm-mux.golden.xml
rename to tests/convert_and_merge_composable_tests/composable-interconnect-existing-fasm-mux.golden.xml
diff --git a/composable-interconnect-existing-fasm-mux.xml b/tests/convert_and_merge_composable_tests/composable-interconnect-existing-fasm-mux.xml
similarity index 100%
rename from composable-interconnect-existing-fasm-mux.xml
rename to tests/convert_and_merge_composable_tests/composable-interconnect-existing-fasm-mux.xml
diff --git a/composable-interconnect-fasm-mux-levels.golden.xml b/tests/convert_and_merge_composable_tests/composable-interconnect-fasm-mux-levels.golden.xml
similarity index 100%
rename from composable-interconnect-fasm-mux-levels.golden.xml
rename to tests/convert_and_merge_composable_tests/composable-interconnect-fasm-mux-levels.golden.xml
diff --git a/composable-interconnect-fasm-mux-levels.xml b/tests/convert_and_merge_composable_tests/composable-interconnect-fasm-mux-levels.xml
similarity index 100%
rename from composable-interconnect-fasm-mux-levels.xml
rename to tests/convert_and_merge_composable_tests/composable-interconnect-fasm-mux-levels.xml
diff --git a/composable-interconnect-fasm-mux.golden.xml b/tests/convert_and_merge_composable_tests/composable-interconnect-fasm-mux.golden.xml
similarity index 100%
rename from composable-interconnect-fasm-mux.golden.xml
rename to tests/convert_and_merge_composable_tests/composable-interconnect-fasm-mux.golden.xml
diff --git a/composable-interconnect-fasm-mux.xml b/tests/convert_and_merge_composable_tests/composable-interconnect-fasm-mux.xml
similarity index 100%
rename from composable-interconnect-fasm-mux.xml
rename to tests/convert_and_merge_composable_tests/composable-interconnect-fasm-mux.xml
diff --git a/composable-interconnect-implicit-parent.golden.xml b/tests/convert_and_merge_composable_tests/composable-interconnect-implicit-parent.golden.xml
similarity index 100%
rename from composable-interconnect-implicit-parent.golden.xml
rename to tests/convert_and_merge_composable_tests/composable-interconnect-implicit-parent.golden.xml
diff --git a/composable-interconnect-implicit-parent.xml b/tests/convert_and_merge_composable_tests/composable-interconnect-implicit-parent.xml
similarity index 100%
rename from composable-interconnect-implicit-parent.xml
rename to tests/convert_and_merge_composable_tests/composable-interconnect-implicit-parent.xml
diff --git a/composable-interconnect-pack_patterns.golden.xml b/tests/convert_and_merge_composable_tests/composable-interconnect-pack_patterns.golden.xml
similarity index 100%
rename from composable-interconnect-pack_patterns.golden.xml
rename to tests/convert_and_merge_composable_tests/composable-interconnect-pack_patterns.golden.xml
diff --git a/composable-interconnect-pack_patterns.xml b/tests/convert_and_merge_composable_tests/composable-interconnect-pack_patterns.xml
similarity index 100%
rename from composable-interconnect-pack_patterns.xml
rename to tests/convert_and_merge_composable_tests/composable-interconnect-pack_patterns.xml
diff --git a/composable-loc-implicit-parent.golden.xml b/tests/convert_and_merge_composable_tests/composable-loc-implicit-parent.golden.xml
similarity index 100%
rename from composable-loc-implicit-parent.golden.xml
rename to tests/convert_and_merge_composable_tests/composable-loc-implicit-parent.golden.xml
diff --git a/composable-loc-implicit-parent.xml b/tests/convert_and_merge_composable_tests/composable-loc-implicit-parent.xml
similarity index 100%
rename from composable-loc-implicit-parent.xml
rename to tests/convert_and_merge_composable_tests/composable-loc-implicit-parent.xml
diff --git a/composable-pb_type-inner.xml b/tests/convert_and_merge_composable_tests/composable-pb_type-inner.xml
similarity index 100%
rename from composable-pb_type-inner.xml
rename to tests/convert_and_merge_composable_tests/composable-pb_type-inner.xml
diff --git a/composable-pb_type-middle.xml b/tests/convert_and_merge_composable_tests/composable-pb_type-middle.xml
similarity index 100%
rename from composable-pb_type-middle.xml
rename to tests/convert_and_merge_composable_tests/composable-pb_type-middle.xml
diff --git a/composable-pb_type.golden.xml b/tests/convert_and_merge_composable_tests/composable-pb_type.golden.xml
similarity index 100%
rename from composable-pb_type.golden.xml
rename to tests/convert_and_merge_composable_tests/composable-pb_type.golden.xml
diff --git a/composable-pb_type.xml b/tests/convert_and_merge_composable_tests/composable-pb_type.xml
similarity index 100%
rename from composable-pb_type.xml
rename to tests/convert_and_merge_composable_tests/composable-pb_type.xml
diff --git a/explicit-port.golden.xml b/tests/convert_and_merge_composable_tests/explicit-port.golden.xml
similarity index 100%
rename from explicit-port.golden.xml
rename to tests/convert_and_merge_composable_tests/explicit-port.golden.xml
diff --git a/explicit-port.xml b/tests/convert_and_merge_composable_tests/explicit-port.xml
similarity index 100%
rename from explicit-port.xml
rename to tests/convert_and_merge_composable_tests/explicit-port.xml
diff --git a/full-test-inner.xml b/tests/convert_and_merge_composable_tests/full-test-inner.xml
similarity index 100%
rename from full-test-inner.xml
rename to tests/convert_and_merge_composable_tests/full-test-inner.xml
diff --git a/full-test.golden.xml b/tests/convert_and_merge_composable_tests/full-test.golden.xml
similarity index 100%
rename from full-test.golden.xml
rename to tests/convert_and_merge_composable_tests/full-test.golden.xml
diff --git a/full-test.xml b/tests/convert_and_merge_composable_tests/full-test.xml
similarity index 100%
rename from full-test.xml
rename to tests/convert_and_merge_composable_tests/full-test.xml
diff --git a/pack_pattern-copy-direct-ports.golden.xml b/tests/convert_and_merge_composable_tests/pack_pattern-copy-direct-ports.golden.xml
similarity index 100%
rename from pack_pattern-copy-direct-ports.golden.xml
rename to tests/convert_and_merge_composable_tests/pack_pattern-copy-direct-ports.golden.xml
diff --git a/pack_pattern-copy-direct-ports.xml b/tests/convert_and_merge_composable_tests/pack_pattern-copy-direct-ports.xml
similarity index 100%
rename from pack_pattern-copy-direct-ports.xml
rename to tests/convert_and_merge_composable_tests/pack_pattern-copy-direct-ports.xml
diff --git a/pack_pattern-merge-type-into-name.golden.xml b/tests/convert_and_merge_composable_tests/pack_pattern-merge-type-into-name.golden.xml
similarity index 100%
rename from pack_pattern-merge-type-into-name.golden.xml
rename to tests/convert_and_merge_composable_tests/pack_pattern-merge-type-into-name.golden.xml
diff --git a/pack_pattern-merge-type-into-name.xml b/tests/convert_and_merge_composable_tests/pack_pattern-merge-type-into-name.xml
similarity index 100%
rename from pack_pattern-merge-type-into-name.xml
rename to tests/convert_and_merge_composable_tests/pack_pattern-merge-type-into-name.xml
diff --git a/pack_pattern-strip-from-pb_type-ports.golden.xml b/tests/convert_and_merge_composable_tests/pack_pattern-strip-from-pb_type-ports.golden.xml
similarity index 100%
rename from pack_pattern-strip-from-pb_type-ports.golden.xml
rename to tests/convert_and_merge_composable_tests/pack_pattern-strip-from-pb_type-ports.golden.xml
diff --git a/pack_pattern-strip-from-pb_type-ports.xml b/tests/convert_and_merge_composable_tests/pack_pattern-strip-from-pb_type-ports.xml
similarity index 100%
rename from pack_pattern-strip-from-pb_type-ports.xml
rename to tests/convert_and_merge_composable_tests/pack_pattern-strip-from-pb_type-ports.xml
diff --git a/preserve-interconnect.golden.xml b/tests/convert_and_merge_composable_tests/preserve-interconnect.golden.xml
similarity index 100%
rename from preserve-interconnect.golden.xml
rename to tests/convert_and_merge_composable_tests/preserve-interconnect.golden.xml
diff --git a/preserve-interconnect.xml b/tests/convert_and_merge_composable_tests/preserve-interconnect.xml
similarity index 100%
rename from preserve-interconnect.xml
rename to tests/convert_and_merge_composable_tests/preserve-interconnect.xml
diff --git a/xsl_tests.cmake b/xsl_tests.cmake
deleted file mode 100644
index e50c50b..0000000
--- a/xsl_tests.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-# Creating new target to call all the added tests
-add_custom_target(all_xsl_tests ALL)
-
-function(XSL_GOLDEN_TEST)
-  # ~~~
-  # XSL_GOLDEN_TEST(
-  #   NAME name
-  #   )
-  # ~~~
-  #
-  # This function is to test the xml_canonicalize_merge function which uses the
-  # convert_and_merge_composable_fpga_architecture.xsl script correctly
-  # transforms XML by comparing against a golden output file.
-  #
-  # NAME name of the test.
-  #
-  # Usage: xsl_golden_testl(NAME <test_name>)
-
-  set(options "")
-  set(oneValueArgs NAME)
-  set(multiValueArgs "")
-  cmake_parse_arguments(
-    XSL_GOLDEN_TEST
-    "${options}"
-    "${oneValueArgs}"
-    "${multiValueArgs}"
-    ${ARGN}
-  )
-
-  set(NAME ${XSL_GOLDEN_TEST_NAME})
-
-  set(INPUT_XML ${NAME}.xml)
-  add_file_target(FILE ${INPUT_XML} SCANNER_TYPE xml)
-
-  set(ACTUAL_XML ${NAME}.actual.xml)
-  xml_canonicalize_merge(
-    NAME merge_${ACTUAL_XML}
-    FILE ${INPUT_XML}
-    OUTPUT ${ACTUAL_XML}
-    EXTRA_ARGUMENTS "-param" "strip_comments" "1"
-    )
-
-  set(GOLDEN_XML ${NAME}.golden.xml)
-  add_file_target(FILE ${GOLDEN_XML} SCANNER_TYPE xml)
-
-  diff(NAME diff_${NAME} GOLDEN ${GOLDEN_XML} ACTUAL ${ACTUAL_XML})
-
-  add_dependencies(all_xsl_tests diff_${NAME})
-endfunction(XSL_GOLDEN_TEST)