Reorganising source code

31 files changed, 21 insertions, 10 deletions

diff --git a/makefile b/makefile
index d4f971b..836c7b7 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,6 @@
 
 OUTPUTDIR = bin
+SOURCEDIR = src
 
 
 
@@ -11,32 +12,42 @@ clean:
 
 
 semantic:
-	ghc --make ./SemanticMain.hs -o ${OUTPUTDIR}/Semantic
+	cd ${SOURCEDIR}; \
+	ghc --make SemanticMain.hs -o ../${OUTPUTDIR}/Semantic
 
 syntactic:
-	ghc --make ./Syntactic.hs -o ${OUTPUTDIR}/Syntactic
+	cd ${SOURCEDIR}; \
+	ghc --make Syntactic.hs -o ../${OUTPUTDIR}/Syntactic
 
 proofgraph:
-	ghc --make ./ProofGraphMain.hs -o ${OUTPUTDIR}/ProofGraph
+	cd ${SOURCEDIR}; \
+	ghc --make ProofGraphMain.hs -o ../${OUTPUTDIR}/ProofGraph
 
 writeproof:
-	ghc --make ./WriteProofMain.hs -o ${OUTPUTDIR}/WriteProof
+	cd ${SOURCEDIR}; \
+	ghc --make WriteProofMain.hs -o ../${OUTPUTDIR}/WriteProof
 
 delete:
-	ghc --make ./Delete.hs -o ${OUTPUTDIR}/Delete
+	cd ${SOURCEDIR}; \
+	ghc --make Delete.hs -o ../${OUTPUTDIR}/Delete
 
 concat:
-	ghc --make ./Concat.hs -o ${OUTPUTDIR}/Concat
+	cd ${SOURCEDIR}; \
+	ghc --make Concat.hs -o ../${OUTPUTDIR}/Concat
 
 listthm:
-	ghc --make ./ListThm.hs -o ${OUTPUTDIR}/ListThm
+	cd ${SOURCEDIR}; \
+	ghc --make ListThm.hs -o ../${OUTPUTDIR}/ListThm
 
 meaningsubst:
-	ghc --make ./MeaningSubst.hs -o ${OUTPUTDIR}/MeaningSubst
+	cd ${SOURCEDIR}; \
+	ghc --make MeaningSubst.hs -o ../${OUTPUTDIR}/MeaningSubst
 
 unittest:
-	ghc --make ./Test.hs -o ${OUTPUTDIR}/UnitTest
+	cd ${SOURCEDIR}; \
+	ghc --make Test.hs -o ../${OUTPUTDIR}/UnitTest
 
 compare:
-	ghc --make ./Compare.hs -o ${OUTPUTDIR}/Compare
+	cd ${SOURCEDIR}; \
+	ghc --make Compare.hs -o ../${OUTPUTDIR}/Compare
 
diff --git a/README b/readme.txt
index 9a55603..9a55603 100644
--- a/README
+++ b/readme.txt
diff --git a/Compare.hs b/src/Compare.hs
index b60250f..b60250f 100644
--- a/Compare.hs
+++ b/src/Compare.hs
diff --git a/Concat.hs b/src/Concat.hs
index 18d0f5d..18d0f5d 100644
--- a/Concat.hs
+++ b/src/Concat.hs
diff --git a/Delete.hs b/src/Delete.hs
index 3b9a1c7..3b9a1c7 100644
--- a/Delete.hs
+++ b/src/Delete.hs
diff --git a/GeneratorTest.hs b/src/GeneratorTest.hs
index 419e904..419e904 100644
--- a/GeneratorTest.hs
+++ b/src/GeneratorTest.hs
diff --git a/Library/Command.hs b/src/Library/Command.hs
index 47f0537..47f0537 100644
--- a/Library/Command.hs
+++ b/src/Library/Command.hs
diff --git a/Library/Cost.hs b/src/Library/Cost.hs
index 86cabdc..86cabdc 100644
--- a/Library/Cost.hs
+++ b/src/Library/Cost.hs
diff --git a/Library/Generator.hs b/src/Library/Generator.hs
index ef9dfe2..ef9dfe2 100644
--- a/Library/Generator.hs
+++ b/src/Library/Generator.hs
diff --git a/Library/GraphPart.hs b/src/Library/GraphPart.hs
index 02a95c0..02a95c0 100644
--- a/Library/GraphPart.hs
+++ b/src/Library/GraphPart.hs
diff --git a/Library/Object.hs b/src/Library/Object.hs
index dd65ded..dd65ded 100644
--- a/Library/Object.hs
+++ b/src/Library/Object.hs
diff --git a/Library/Parse.hs b/src/Library/Parse.hs
index 7494822..7494822 100644
--- a/Library/Parse.hs
+++ b/src/Library/Parse.hs
diff --git a/Library/ProofGraph.hs b/src/Library/ProofGraph.hs
index 0e7e80a..0e7e80a 100644
--- a/Library/ProofGraph.hs
+++ b/src/Library/ProofGraph.hs
diff --git a/Library/Semantic.hs b/src/Library/Semantic.hs
index 0f08d52..0f08d52 100644
--- a/Library/Semantic.hs
+++ b/src/Library/Semantic.hs
diff --git a/Library/Stack.hs b/src/Library/Stack.hs
index 99cd8e1..99cd8e1 100644
--- a/Library/Stack.hs
+++ b/src/Library/Stack.hs
diff --git a/Library/Term.hs b/src/Library/Term.hs
index be9e53b..be9e53b 100644
--- a/Library/Term.hs
+++ b/src/Library/Term.hs
diff --git a/Library/TermNet.hs b/src/Library/TermNet.hs
index 16b5446..16b5446 100644
--- a/Library/TermNet.hs
+++ b/src/Library/TermNet.hs
diff --git a/Library/Theorem.hs b/src/Library/Theorem.hs
index fc66cc2..fc66cc2 100644
--- a/Library/Theorem.hs
+++ b/src/Library/Theorem.hs
diff --git a/Library/TypeVar.hs b/src/Library/TypeVar.hs
index d2915e6..d2915e6 100644
--- a/Library/TypeVar.hs
+++ b/src/Library/TypeVar.hs
diff --git a/Library/Usage.hs b/src/Library/Usage.hs
index a307274..a307274 100644
--- a/Library/Usage.hs
+++ b/src/Library/Usage.hs
diff --git a/Library/WriteProof.hs b/src/Library/WriteProof.hs
index 2c15b74..2c15b74 100644
--- a/Library/WriteProof.hs
+++ b/src/Library/WriteProof.hs
diff --git a/Library/alternate_multi_command.hs b/src/Library/alternate_multi_command.hs
index da49a7d..da49a7d 100644
--- a/Library/alternate_multi_command.hs
+++ b/src/Library/alternate_multi_command.hs
diff --git a/ListThm.hs b/src/ListThm.hs
index 540486d..540486d 100644
--- a/ListThm.hs
+++ b/src/ListThm.hs
diff --git a/MeaningSubst.hs b/src/MeaningSubst.hs
index a0821b5..a0821b5 100644
--- a/MeaningSubst.hs
+++ b/src/MeaningSubst.hs
diff --git a/ProofGraphMain.hs b/src/ProofGraphMain.hs
index 292cf01..292cf01 100644
--- a/ProofGraphMain.hs
+++ b/src/ProofGraphMain.hs
diff --git a/SemanticMain.hs b/src/SemanticMain.hs
index c07fc8c..c07fc8c 100644
--- a/SemanticMain.hs
+++ b/src/SemanticMain.hs
diff --git a/Syntactic.hs b/src/Syntactic.hs
index 870cc35..870cc35 100644
--- a/Syntactic.hs
+++ b/src/Syntactic.hs
diff --git a/TermNetTest.hs b/src/TermNetTest.hs
index 57eb06f..57eb06f 100644
--- a/TermNetTest.hs
+++ b/src/TermNetTest.hs
diff --git a/Test.hs b/src/Test.hs
index 47bba79..47bba79 100644
--- a/Test.hs
+++ b/src/Test.hs
diff --git a/Test/DataTypes.hs b/src/Test/DataTypes.hs
index 28db135..28db135 100644
--- a/Test/DataTypes.hs
+++ b/src/Test/DataTypes.hs
diff --git a/WriteProofMain.hs b/src/WriteProofMain.hs
index 2f8625e..2f8625e 100644
--- a/WriteProofMain.hs
+++ b/src/WriteProofMain.hs