Index: tests/Fragmentations/Makefile.am
===================================================================
--- tests/Fragmentations/Makefile.am	(revision e85333cbdf94b0f1a5c3369818d89b648d323a69)
+++ tests/Fragmentations/Makefile.am	(revision bc28b0f3f8149d6034a044085ee96722cb9a75e3)
@@ -4,22 +4,26 @@
 	testsuite.at \
 	$(TESTSUITE) \
+	analyzer.in \
 	atlocal.in \
+	joiner.in \
 	molecuilder.in \
 	$(srcdir)/package.m4 \
-	$(srcdir)/1_2-dimethoxyethane \
-	$(srcdir)/1_2-dimethylbenzene \
-	$(srcdir)/2-methylcyclohexanone \
-	$(srcdir)/benzene \
-	$(srcdir)/cholesterol \
-	$(srcdir)/cycloheptane \
-	$(srcdir)/dimethyl_bromomalonate \
-	$(srcdir)/glucose \
-	$(srcdir)/heptan \
-	$(srcdir)/isoleucine \
-	$(srcdir)/neohexane \
-	$(srcdir)/N_N-dimethylacetamide \
-	$(srcdir)/proline \
-	$(srcdir)/putrescine \
-	$(srcdir)/tartaric_acid
+	$(srcdir)/Analyzing/heptan \
+	$(srcdir)/Fragmenting/1_2-dimethoxyethane \
+	$(srcdir)/Fragmenting/1_2-dimethylbenzene \
+	$(srcdir)/Fragmenting/2-methylcyclohexanone \
+	$(srcdir)/Fragmenting/benzene \
+	$(srcdir)/Fragmenting/cholesterol \
+	$(srcdir)/Fragmenting/cycloheptane \
+	$(srcdir)/Fragmenting/dimethyl_bromomalonate \
+	$(srcdir)/Fragmenting/glucose \
+	$(srcdir)/Fragmenting/heptan \
+	$(srcdir)/Fragmenting/isoleucine \
+	$(srcdir)/Fragmenting/neohexane \
+	$(srcdir)/Fragmenting/N_N-dimethylacetamide \
+	$(srcdir)/Fragmenting/proline \
+	$(srcdir)/Fragmenting/putrescine \
+	$(srcdir)/Fragmenting/tartaric_acid \
+	$(srcdir)/Joining/heptan
 
 TESTSUITE = $(srcdir)/testsuite
@@ -28,84 +32,86 @@
 
 TESTSCRIPTS = \
-	1_2-dimethoxyethane/testsuite-1_2-dimethoxyethane-order1.at \
-	1_2-dimethoxyethane/testsuite-1_2-dimethoxyethane-order2.at \
-	1_2-dimethoxyethane/testsuite-1_2-dimethoxyethane-order3.at \
-	1_2-dimethoxyethane/testsuite-1_2-dimethoxyethane-order4.at \
-	1_2-dimethylbenzene/testsuite-1_2-dimethylbenzene-order1.at \
-	1_2-dimethylbenzene/testsuite-1_2-dimethylbenzene-order2.at \
-	1_2-dimethylbenzene/testsuite-1_2-dimethylbenzene-order3.at \
-	1_2-dimethylbenzene/testsuite-1_2-dimethylbenzene-order4.at \
-	2-methylcyclohexanone/testsuite-2-methylcyclohexanone-order1.at \
-	2-methylcyclohexanone/testsuite-2-methylcyclohexanone-order2.at \
-	2-methylcyclohexanone/testsuite-2-methylcyclohexanone-order3.at \
-	2-methylcyclohexanone/testsuite-2-methylcyclohexanone-order4.at \
-	benzene/testsuite-benzene-order1.at \
-	benzene/testsuite-benzene-order2.at \
-	benzene/testsuite-benzene-order3.at \
-	benzene/testsuite-benzene-order4.at \
-	benzene/testsuite-benzene-order5.at \
-	benzene/testsuite-benzene-order6.at \
-	cholesterol/testsuite-cholesterol-order1.at \
-	cholesterol/testsuite-cholesterol-order2.at \
-	cholesterol/testsuite-cholesterol-order3.at \
-	cholesterol/testsuite-cholesterol-order4.at \
-	cycloheptane/testsuite-cycloheptane-order1.at \
-	cycloheptane/testsuite-cycloheptane-order2.at \
-	cycloheptane/testsuite-cycloheptane-order3.at \
-	cycloheptane/testsuite-cycloheptane-order4.at \
-	cycloheptane/testsuite-cycloheptane-order5.at \
-	cycloheptane/testsuite-cycloheptane-order6.at \
-	dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order1.at \
-	dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order2.at \
-	dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order3.at \
-	dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order4.at \
-	dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order5.at \
-	dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order6.at \
-	glucose/testsuite-glucose-order1.at \
-	glucose/testsuite-glucose-order2.at \
-	glucose/testsuite-glucose-order3.at \
-	glucose/testsuite-glucose-order4.at \
-	glucose/testsuite-glucose-order5.at \
-	glucose/testsuite-glucose-order6.at \
-	heptan/testsuite-heptan-order1.at \
-	heptan/testsuite-heptan-order2.at \
-	heptan/testsuite-heptan-order3.at \
-	heptan/testsuite-heptan-order4.at \
-	isoleucine/testsuite-isoleucine-order1.at \
-	isoleucine/testsuite-isoleucine-order2.at \
-	isoleucine/testsuite-isoleucine-order3.at \
-	isoleucine/testsuite-isoleucine-order4.at \
-	isoleucine/testsuite-isoleucine-order5.at \
-	isoleucine/testsuite-isoleucine-order6.at \
-	neohexane/testsuite-neohexane-order1.at \
-	neohexane/testsuite-neohexane-order2.at \
-	neohexane/testsuite-neohexane-order3.at \
-	neohexane/testsuite-neohexane-order4.at \
-	neohexane/testsuite-neohexane-order5.at \
-	neohexane/testsuite-neohexane-order6.at \
-	N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order1.at \
-	N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order2.at \
-	N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order3.at \
-	N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order4.at \
-	N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order5.at \
-	N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order6.at \
-	proline/testsuite-proline-order1.at \
-	proline/testsuite-proline-order2.at \
-	proline/testsuite-proline-order3.at \
-	proline/testsuite-proline-order4.at \
-	proline/testsuite-proline-order5.at \
-	proline/testsuite-proline-order6.at \
-	putrescine/testsuite-putrescine-order1.at \
-	putrescine/testsuite-putrescine-order2.at \
-	putrescine/testsuite-putrescine-order3.at \
-	putrescine/testsuite-putrescine-order4.at \
-	putrescine/testsuite-putrescine-order5.at \
-	putrescine/testsuite-putrescine-order6.at \
-	tartaric_acid/testsuite-tartaric_acid-order1.at \
-	tartaric_acid/testsuite-tartaric_acid-order2.at \
-	tartaric_acid/testsuite-tartaric_acid-order3.at \
-	tartaric_acid/testsuite-tartaric_acid-order4.at \
-	tartaric_acid/testsuite-tartaric_acid-order5.at \
-	tartaric_acid/testsuite-tartaric_acid-order6.at
+	Fragmenting/1_2-dimethoxyethane/testsuite-fragmenting-1_2-dimethoxyethane-order1.at \
+	Fragmenting/1_2-dimethoxyethane/testsuite-fragmenting-1_2-dimethoxyethane-order2.at \
+	Fragmenting/1_2-dimethoxyethane/testsuite-fragmenting-1_2-dimethoxyethane-order3.at \
+	Fragmenting/1_2-dimethoxyethane/testsuite-fragmenting-1_2-dimethoxyethane-order4.at \
+	Fragmenting/1_2-dimethylbenzene/testsuite-fragmenting-1_2-dimethylbenzene-order1.at \
+	Fragmenting/1_2-dimethylbenzene/testsuite-fragmenting-1_2-dimethylbenzene-order2.at \
+	Fragmenting/1_2-dimethylbenzene/testsuite-fragmenting-1_2-dimethylbenzene-order3.at \
+	Fragmenting/1_2-dimethylbenzene/testsuite-fragmenting-1_2-dimethylbenzene-order4.at \
+	Fragmenting/2-methylcyclohexanone/testsuite-fragmenting-2-methylcyclohexanone-order1.at \
+	Fragmenting/2-methylcyclohexanone/testsuite-fragmenting-2-methylcyclohexanone-order2.at \
+	Fragmenting/2-methylcyclohexanone/testsuite-fragmenting-2-methylcyclohexanone-order3.at \
+	Fragmenting/2-methylcyclohexanone/testsuite-fragmenting-2-methylcyclohexanone-order4.at \
+	Fragmenting/benzene/testsuite-fragmenting-benzene-order1.at \
+	Fragmenting/benzene/testsuite-fragmenting-benzene-order2.at \
+	Fragmenting/benzene/testsuite-fragmenting-benzene-order3.at \
+	Fragmenting/benzene/testsuite-fragmenting-benzene-order4.at \
+	Fragmenting/benzene/testsuite-fragmenting-benzene-order5.at \
+	Fragmenting/benzene/testsuite-fragmenting-benzene-order6.at \
+	Fragmenting/cholesterol/testsuite-fragmenting-cholesterol-order1.at \
+	Fragmenting/cholesterol/testsuite-fragmenting-cholesterol-order2.at \
+	Fragmenting/cholesterol/testsuite-fragmenting-cholesterol-order3.at \
+	Fragmenting/cholesterol/testsuite-fragmenting-cholesterol-order4.at \
+	Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order1.at \
+	Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order2.at \
+	Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order3.at \
+	Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order4.at \
+	Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order5.at \
+	Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order6.at \
+	Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order1.at \
+	Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order2.at \
+	Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order3.at \
+	Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order4.at \
+	Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order5.at \
+	Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order6.at \
+	Fragmenting/glucose/testsuite-fragmenting-glucose-order1.at \
+	Fragmenting/glucose/testsuite-fragmenting-glucose-order2.at \
+	Fragmenting/glucose/testsuite-fragmenting-glucose-order3.at \
+	Fragmenting/glucose/testsuite-fragmenting-glucose-order4.at \
+	Fragmenting/glucose/testsuite-fragmenting-glucose-order5.at \
+	Fragmenting/glucose/testsuite-fragmenting-glucose-order6.at \
+	Fragmenting/heptan/testsuite-fragmenting-heptan-order1.at \
+	Fragmenting/heptan/testsuite-fragmenting-heptan-order2.at \
+	Fragmenting/heptan/testsuite-fragmenting-heptan-order3.at \
+	Fragmenting/heptan/testsuite-fragmenting-heptan-order4.at \
+	Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order1.at \
+	Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order2.at \
+	Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order3.at \
+	Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order4.at \
+	Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order5.at \
+	Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order6.at \
+	Fragmenting/neohexane/testsuite-fragmenting-neohexane-order1.at \
+	Fragmenting/neohexane/testsuite-fragmenting-neohexane-order2.at \
+	Fragmenting/neohexane/testsuite-fragmenting-neohexane-order3.at \
+	Fragmenting/neohexane/testsuite-fragmenting-neohexane-order4.at \
+	Fragmenting/neohexane/testsuite-fragmenting-neohexane-order5.at \
+	Fragmenting/neohexane/testsuite-fragmenting-neohexane-order6.at \
+	Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order1.at \
+	Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order2.at \
+	Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order3.at \
+	Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order4.at \
+	Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order5.at \
+	Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order6.at \
+	Fragmenting/proline/testsuite-fragmenting-proline-order1.at \
+	Fragmenting/proline/testsuite-fragmenting-proline-order2.at \
+	Fragmenting/proline/testsuite-fragmenting-proline-order3.at \
+	Fragmenting/proline/testsuite-fragmenting-proline-order4.at \
+	Fragmenting/proline/testsuite-fragmenting-proline-order5.at \
+	Fragmenting/proline/testsuite-fragmenting-proline-order6.at \
+	Fragmenting/putrescine/testsuite-fragmenting-putrescine-order1.at \
+	Fragmenting/putrescine/testsuite-fragmenting-putrescine-order2.at \
+	Fragmenting/putrescine/testsuite-fragmenting-putrescine-order3.at \
+	Fragmenting/putrescine/testsuite-fragmenting-putrescine-order4.at \
+	Fragmenting/putrescine/testsuite-fragmenting-putrescine-order5.at \
+	Fragmenting/putrescine/testsuite-fragmenting-putrescine-order6.at \
+	Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order1.at \
+	Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order2.at \
+	Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order3.at \
+	Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order4.at \
+	Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order5.at \
+	Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order6.at \
+	Joining/heptan/testsuite-joining-heptan.at \
+	Analyzing/heptan/testsuite-analyzing-heptan.at
 
 max_jobs = 4
