diff --git a/CMakeLists.txt b/src/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to src/CMakeLists.txt
diff --git a/CMakeScripts/FindANTLR.cmake b/src/CMakeScripts/FindANTLR.cmake
similarity index 100%
rename from CMakeScripts/FindANTLR.cmake
rename to src/CMakeScripts/FindANTLR.cmake
diff --git a/CMakeScripts/FindCorpus2.cmake b/src/CMakeScripts/FindCorpus2.cmake
similarity index 100%
rename from CMakeScripts/FindCorpus2.cmake
rename to src/CMakeScripts/FindCorpus2.cmake
diff --git a/CMakeScripts/FindGlib.cmake b/src/CMakeScripts/FindGlib.cmake
similarity index 100%
rename from CMakeScripts/FindGlib.cmake
rename to src/CMakeScripts/FindGlib.cmake
diff --git a/CMakeScripts/FindGlibmm.cmake b/src/CMakeScripts/FindGlibmm.cmake
similarity index 100%
rename from CMakeScripts/FindGlibmm.cmake
rename to src/CMakeScripts/FindGlibmm.cmake
diff --git a/CMakeScripts/FindICU.cmake b/src/CMakeScripts/FindICU.cmake
similarity index 100%
rename from CMakeScripts/FindICU.cmake
rename to src/CMakeScripts/FindICU.cmake
diff --git a/CMakeScripts/FindLibXML++.cmake b/src/CMakeScripts/FindLibXML++.cmake
similarity index 100%
rename from CMakeScripts/FindLibXML++.cmake
rename to src/CMakeScripts/FindLibXML++.cmake
diff --git a/CMakeScripts/FindLibXML2.cmake b/src/CMakeScripts/FindLibXML2.cmake
similarity index 100%
rename from CMakeScripts/FindLibXML2.cmake
rename to src/CMakeScripts/FindLibXML2.cmake
diff --git a/CMakeScripts/FindLibedit.cmake b/src/CMakeScripts/FindLibedit.cmake
similarity index 100%
rename from CMakeScripts/FindLibedit.cmake
rename to src/CMakeScripts/FindLibedit.cmake
diff --git a/CMakeScripts/FindLoki.cmake b/src/CMakeScripts/FindLoki.cmake
similarity index 100%
rename from CMakeScripts/FindLoki.cmake
rename to src/CMakeScripts/FindLoki.cmake
diff --git a/CMakeScripts/FindPwrUtils.cmake b/src/CMakeScripts/FindPwrUtils.cmake
similarity index 100%
rename from CMakeScripts/FindPwrUtils.cmake
rename to src/CMakeScripts/FindPwrUtils.cmake
diff --git a/CMakeScripts/FindSigC++.cmake b/src/CMakeScripts/FindSigC++.cmake
similarity index 100%
rename from CMakeScripts/FindSigC++.cmake
rename to src/CMakeScripts/FindSigC++.cmake
diff --git a/CMakeScripts/LibFindMacros.cmake b/src/CMakeScripts/LibFindMacros.cmake
similarity index 100%
rename from CMakeScripts/LibFindMacros.cmake
rename to src/CMakeScripts/LibFindMacros.cmake
diff --git a/doc/wccl-qa.py b/src/doc/wccl-qa.py
similarity index 100%
rename from doc/wccl-qa.py
rename to src/doc/wccl-qa.py
diff --git a/doc/wccl-rules.py b/src/doc/wccl-rules.py
similarity index 100%
rename from doc/wccl-rules.py
rename to src/doc/wccl-rules.py
diff --git a/doc/wccl-run.py b/src/doc/wccl-run.py
similarity index 100%
rename from doc/wccl-run.py
rename to src/doc/wccl-run.py
diff --git a/examples/in-xces.xml b/src/examples/in-xces.xml
similarity index 100%
rename from examples/in-xces.xml
rename to src/examples/in-xces.xml
diff --git a/examples/in2-xces.xml b/src/examples/in2-xces.xml
similarity index 100%
rename from examples/in2-xces.xml
rename to src/examples/in2-xces.xml
diff --git a/examples/indecl-ops.ccl b/src/examples/indecl-ops.ccl
similarity index 100%
rename from examples/indecl-ops.ccl
rename to src/examples/indecl-ops.ccl
diff --git a/examples/indecl.lex b/src/examples/indecl.lex
similarity index 100%
rename from examples/indecl.lex
rename to src/examples/indecl.lex
diff --git a/examples/ne-match.ccl b/src/examples/ne-match.ccl
similarity index 100%
rename from examples/ne-match.ccl
rename to src/examples/ne-match.ccl
diff --git a/examples/np-match.ccl b/src/examples/np-match.ccl
similarity index 100%
rename from examples/np-match.ccl
rename to src/examples/np-match.ccl
diff --git a/examples/prop-match.ccl b/src/examples/prop-match.ccl
similarity index 100%
rename from examples/prop-match.ccl
rename to src/examples/prop-match.ccl
diff --git a/examples/qa-input0.xml b/src/examples/qa-input0.xml
similarity index 100%
rename from examples/qa-input0.xml
rename to src/examples/qa-input0.xml
diff --git a/examples/qa-input1.xml b/src/examples/qa-input1.xml
similarity index 100%
rename from examples/qa-input1.xml
rename to src/examples/qa-input1.xml
diff --git a/examples/qa-input2.xml b/src/examples/qa-input2.xml
similarity index 100%
rename from examples/qa-input2.xml
rename to src/examples/qa-input2.xml
diff --git a/examples/qa-input3.xml b/src/examples/qa-input3.xml
similarity index 100%
rename from examples/qa-input3.xml
rename to src/examples/qa-input3.xml
diff --git a/examples/qa-prop-match.ccl b/src/examples/qa-prop-match.ccl
similarity index 100%
rename from examples/qa-prop-match.ccl
rename to src/examples/qa-prop-match.ccl
diff --git a/examples/simple-match.ccl b/src/examples/simple-match.ccl
similarity index 100%
rename from examples/simple-match.ccl
rename to src/examples/simple-match.ccl
diff --git a/examples/simple-ops.ccl b/src/examples/simple-ops.ccl
similarity index 100%
rename from examples/simple-ops.ccl
rename to src/examples/simple-ops.ccl
diff --git a/examples/takipi_rules.ccl b/src/examples/takipi_rules.ccl
similarity index 100%
rename from examples/takipi_rules.ccl
rename to src/examples/takipi_rules.ccl
diff --git a/examples/wccl-qa_README b/src/examples/wccl-qa_README
similarity index 100%
rename from examples/wccl-qa_README
rename to src/examples/wccl-qa_README
diff --git a/libmwereader/CMakeLists.txt b/src/libmwereader/CMakeLists.txt
similarity index 100%
rename from libmwereader/CMakeLists.txt
rename to src/libmwereader/CMakeLists.txt
diff --git a/libmwereader/mwe.cpp b/src/libmwereader/mwe.cpp
similarity index 100%
rename from libmwereader/mwe.cpp
rename to src/libmwereader/mwe.cpp
diff --git a/libmwereader/mwe.h b/src/libmwereader/mwe.h
similarity index 100%
rename from libmwereader/mwe.h
rename to src/libmwereader/mwe.h
diff --git a/libmwereader/mweparser.cpp b/src/libmwereader/mweparser.cpp
similarity index 100%
rename from libmwereader/mweparser.cpp
rename to src/libmwereader/mweparser.cpp
diff --git a/libmwereader/mweparser.h b/src/libmwereader/mweparser.h
similarity index 100%
rename from libmwereader/mweparser.h
rename to src/libmwereader/mweparser.h
diff --git a/libmwereader/mwereader.cpp b/src/libmwereader/mwereader.cpp
similarity index 100%
rename from libmwereader/mwereader.cpp
rename to src/libmwereader/mwereader.cpp
diff --git a/libmwereader/mwereader.h b/src/libmwereader/mwereader.h
similarity index 100%
rename from libmwereader/mwereader.h
rename to src/libmwereader/mwereader.h
diff --git a/libmwereader/mwertest.cpp b/src/libmwereader/mwertest.cpp
similarity index 100%
rename from libmwereader/mwertest.cpp
rename to src/libmwereader/mwertest.cpp
diff --git a/libmwereader/test_mwe.xml b/src/libmwereader/test_mwe.xml
similarity index 100%
rename from libmwereader/test_mwe.xml
rename to src/libmwereader/test_mwe.xml
diff --git a/libmwereader/tests/CMakeLists.txt b/src/libmwereader/tests/CMakeLists.txt
similarity index 100%
rename from libmwereader/tests/CMakeLists.txt
rename to src/libmwereader/tests/CMakeLists.txt
diff --git a/libmwereader/tests/data/fix_gap_mwe.xml b/src/libmwereader/tests/data/fix_gap_mwe.xml
similarity index 100%
rename from libmwereader/tests/data/fix_gap_mwe.xml
rename to src/libmwereader/tests/data/fix_gap_mwe.xml
diff --git a/libmwereader/tests/data/fix_mwe.xml b/src/libmwereader/tests/data/fix_mwe.xml
similarity index 100%
rename from libmwereader/tests/data/fix_mwe.xml
rename to src/libmwereader/tests/data/fix_mwe.xml
diff --git a/libmwereader/tests/data/flex_gap_mwe.xml b/src/libmwereader/tests/data/flex_gap_mwe.xml
similarity index 100%
rename from libmwereader/tests/data/flex_gap_mwe.xml
rename to src/libmwereader/tests/data/flex_gap_mwe.xml
diff --git a/libmwereader/tests/data/flex_mwe.xml b/src/libmwereader/tests/data/flex_mwe.xml
similarity index 100%
rename from libmwereader/tests/data/flex_mwe.xml
rename to src/libmwereader/tests/data/flex_mwe.xml
diff --git a/libmwereader/tests/data/test1.kipi.xml b/src/libmwereader/tests/data/test1.kipi.xml
similarity index 100%
rename from libmwereader/tests/data/test1.kipi.xml
rename to src/libmwereader/tests/data/test1.kipi.xml
diff --git a/libmwereader/tests/data/test1.xml b/src/libmwereader/tests/data/test1.xml
similarity index 100%
rename from libmwereader/tests/data/test1.xml
rename to src/libmwereader/tests/data/test1.xml
diff --git a/libmwereader/tests/data/test_mwe.xml b/src/libmwereader/tests/data/test_mwe.xml
similarity index 100%
rename from libmwereader/tests/data/test_mwe.xml
rename to src/libmwereader/tests/data/test_mwe.xml
diff --git a/libmwereader/tests/main.cpp b/src/libmwereader/tests/main.cpp
similarity index 100%
rename from libmwereader/tests/main.cpp
rename to src/libmwereader/tests/main.cpp
diff --git a/libmwereader/tests/mwe.cpp b/src/libmwereader/tests/mwe.cpp
similarity index 100%
rename from libmwereader/tests/mwe.cpp
rename to src/libmwereader/tests/mwe.cpp
diff --git a/libmwereader/tests/mwefunctional.cpp b/src/libmwereader/tests/mwefunctional.cpp
similarity index 100%
rename from libmwereader/tests/mwefunctional.cpp
rename to src/libmwereader/tests/mwefunctional.cpp
diff --git a/libmwereader/tests/mweparser.cpp b/src/libmwereader/tests/mweparser.cpp
similarity index 100%
rename from libmwereader/tests/mweparser.cpp
rename to src/libmwereader/tests/mweparser.cpp
diff --git a/libmwereader/tests/mwereader.cpp b/src/libmwereader/tests/mwereader.cpp
similarity index 100%
rename from libmwereader/tests/mwereader.cpp
rename to src/libmwereader/tests/mwereader.cpp
diff --git a/libwccl/CMakeLists.txt b/src/libwccl/CMakeLists.txt
similarity index 100%
rename from libwccl/CMakeLists.txt
rename to src/libwccl/CMakeLists.txt
diff --git a/libwccl/boilerplate.cpp.in b/src/libwccl/boilerplate.cpp.in
similarity index 100%
rename from libwccl/boilerplate.cpp.in
rename to src/libwccl/boilerplate.cpp.in
diff --git a/libwccl/boilerplate.h.in b/src/libwccl/boilerplate.h.in
similarity index 100%
rename from libwccl/boilerplate.h.in
rename to src/libwccl/boilerplate.h.in
diff --git a/libwccl/exception.cpp b/src/libwccl/exception.cpp
similarity index 100%
rename from libwccl/exception.cpp
rename to src/libwccl/exception.cpp
diff --git a/libwccl/exception.h b/src/libwccl/exception.h
similarity index 100%
rename from libwccl/exception.h
rename to src/libwccl/exception.h
diff --git a/libwccl/lexicon/lexfilegrammar.g b/src/libwccl/lexicon/lexfilegrammar.g
similarity index 100%
rename from libwccl/lexicon/lexfilegrammar.g
rename to src/libwccl/lexicon/lexfilegrammar.g
diff --git a/libwccl/lexicon/lexicon.cpp b/src/libwccl/lexicon/lexicon.cpp
similarity index 100%
rename from libwccl/lexicon/lexicon.cpp
rename to src/libwccl/lexicon/lexicon.cpp
diff --git a/libwccl/lexicon/lexicon.h b/src/libwccl/lexicon/lexicon.h
similarity index 100%
rename from libwccl/lexicon/lexicon.h
rename to src/libwccl/lexicon/lexicon.h
diff --git a/libwccl/lexicon/lexiconparser.cpp b/src/libwccl/lexicon/lexiconparser.cpp
similarity index 100%
rename from libwccl/lexicon/lexiconparser.cpp
rename to src/libwccl/lexicon/lexiconparser.cpp
diff --git a/libwccl/lexicon/lexiconparser.h b/src/libwccl/lexicon/lexiconparser.h
similarity index 100%
rename from libwccl/lexicon/lexiconparser.h
rename to src/libwccl/lexicon/lexiconparser.h
diff --git a/libwccl/lexicon/lexicons.cpp b/src/libwccl/lexicon/lexicons.cpp
similarity index 100%
rename from libwccl/lexicon/lexicons.cpp
rename to src/libwccl/lexicon/lexicons.cpp
diff --git a/libwccl/lexicon/lexicons.h b/src/libwccl/lexicon/lexicons.h
similarity index 100%
rename from libwccl/lexicon/lexicons.h
rename to src/libwccl/lexicon/lexicons.h
diff --git a/libwccl/mk.sh b/src/libwccl/mk.sh
similarity index 100%
rename from libwccl/mk.sh
rename to src/libwccl/mk.sh
diff --git a/libwccl/ops/actionexeccontext.h b/src/libwccl/ops/actionexeccontext.h
similarity index 100%
rename from libwccl/ops/actionexeccontext.h
rename to src/libwccl/ops/actionexeccontext.h
diff --git a/libwccl/ops/expression.h b/src/libwccl/ops/expression.h
similarity index 100%
rename from libwccl/ops/expression.h
rename to src/libwccl/ops/expression.h
diff --git a/libwccl/ops/formatters.cpp b/src/libwccl/ops/formatters.cpp
similarity index 100%
rename from libwccl/ops/formatters.cpp
rename to src/libwccl/ops/formatters.cpp
diff --git a/libwccl/ops/formatters.h b/src/libwccl/ops/formatters.h
similarity index 100%
rename from libwccl/ops/formatters.h
rename to src/libwccl/ops/formatters.h
diff --git a/libwccl/ops/function.h b/src/libwccl/ops/function.h
similarity index 100%
rename from libwccl/ops/function.h
rename to src/libwccl/ops/function.h
diff --git a/libwccl/ops/functions/bool/iteration.cpp b/src/libwccl/ops/functions/bool/iteration.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/iteration.cpp
rename to src/libwccl/ops/functions/bool/iteration.cpp
diff --git a/libwccl/ops/functions/bool/iteration.h b/src/libwccl/ops/functions/bool/iteration.h
similarity index 100%
rename from libwccl/ops/functions/bool/iteration.h
rename to src/libwccl/ops/functions/bool/iteration.h
diff --git a/libwccl/ops/functions/bool/iterations/atleast.cpp b/src/libwccl/ops/functions/bool/iterations/atleast.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/iterations/atleast.cpp
rename to src/libwccl/ops/functions/bool/iterations/atleast.cpp
diff --git a/libwccl/ops/functions/bool/iterations/atleast.h b/src/libwccl/ops/functions/bool/iterations/atleast.h
similarity index 100%
rename from libwccl/ops/functions/bool/iterations/atleast.h
rename to src/libwccl/ops/functions/bool/iterations/atleast.h
diff --git a/libwccl/ops/functions/bool/iterations/leftlook.cpp b/src/libwccl/ops/functions/bool/iterations/leftlook.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/iterations/leftlook.cpp
rename to src/libwccl/ops/functions/bool/iterations/leftlook.cpp
diff --git a/libwccl/ops/functions/bool/iterations/leftlook.h b/src/libwccl/ops/functions/bool/iterations/leftlook.h
similarity index 100%
rename from libwccl/ops/functions/bool/iterations/leftlook.h
rename to src/libwccl/ops/functions/bool/iterations/leftlook.h
diff --git a/libwccl/ops/functions/bool/iterations/only.cpp b/src/libwccl/ops/functions/bool/iterations/only.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/iterations/only.cpp
rename to src/libwccl/ops/functions/bool/iterations/only.cpp
diff --git a/libwccl/ops/functions/bool/iterations/only.h b/src/libwccl/ops/functions/bool/iterations/only.h
similarity index 100%
rename from libwccl/ops/functions/bool/iterations/only.h
rename to src/libwccl/ops/functions/bool/iterations/only.h
diff --git a/libwccl/ops/functions/bool/iterations/rightlook.cpp b/src/libwccl/ops/functions/bool/iterations/rightlook.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/iterations/rightlook.cpp
rename to src/libwccl/ops/functions/bool/iterations/rightlook.cpp
diff --git a/libwccl/ops/functions/bool/iterations/rightlook.h b/src/libwccl/ops/functions/bool/iterations/rightlook.h
similarity index 100%
rename from libwccl/ops/functions/bool/iterations/rightlook.h
rename to src/libwccl/ops/functions/bool/iterations/rightlook.h
diff --git a/libwccl/ops/functions/bool/iterations/skip.cpp b/src/libwccl/ops/functions/bool/iterations/skip.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/iterations/skip.cpp
rename to src/libwccl/ops/functions/bool/iterations/skip.cpp
diff --git a/libwccl/ops/functions/bool/iterations/skip.h b/src/libwccl/ops/functions/bool/iterations/skip.h
similarity index 100%
rename from libwccl/ops/functions/bool/iterations/skip.h
rename to src/libwccl/ops/functions/bool/iterations/skip.h
diff --git a/libwccl/ops/functions/bool/predicate.cpp b/src/libwccl/ops/functions/bool/predicate.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicate.cpp
rename to src/libwccl/ops/functions/bool/predicate.cpp
diff --git a/libwccl/ops/functions/bool/predicate.h b/src/libwccl/ops/functions/bool/predicate.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicate.h
rename to src/libwccl/ops/functions/bool/predicate.h
diff --git a/libwccl/ops/functions/bool/predicates/ambiguous.cpp b/src/libwccl/ops/functions/bool/predicates/ambiguous.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/ambiguous.cpp
rename to src/libwccl/ops/functions/bool/predicates/ambiguous.cpp
diff --git a/libwccl/ops/functions/bool/predicates/ambiguous.h b/src/libwccl/ops/functions/bool/predicates/ambiguous.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/ambiguous.h
rename to src/libwccl/ops/functions/bool/predicates/ambiguous.h
diff --git a/libwccl/ops/functions/bool/predicates/and.cpp b/src/libwccl/ops/functions/bool/predicates/and.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/and.cpp
rename to src/libwccl/ops/functions/bool/predicates/and.cpp
diff --git a/libwccl/ops/functions/bool/predicates/and.h b/src/libwccl/ops/functions/bool/predicates/and.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/and.h
rename to src/libwccl/ops/functions/bool/predicates/and.h
diff --git a/libwccl/ops/functions/bool/predicates/ann.cpp b/src/libwccl/ops/functions/bool/predicates/ann.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/ann.cpp
rename to src/libwccl/ops/functions/bool/predicates/ann.cpp
diff --git a/libwccl/ops/functions/bool/predicates/ann.h b/src/libwccl/ops/functions/bool/predicates/ann.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/ann.h
rename to src/libwccl/ops/functions/bool/predicates/ann.h
diff --git a/libwccl/ops/functions/bool/predicates/annsub.cpp b/src/libwccl/ops/functions/bool/predicates/annsub.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/annsub.cpp
rename to src/libwccl/ops/functions/bool/predicates/annsub.cpp
diff --git a/libwccl/ops/functions/bool/predicates/annsub.h b/src/libwccl/ops/functions/bool/predicates/annsub.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/annsub.h
rename to src/libwccl/ops/functions/bool/predicates/annsub.h
diff --git a/libwccl/ops/functions/bool/predicates/anntoken.cpp b/src/libwccl/ops/functions/bool/predicates/anntoken.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/anntoken.cpp
rename to src/libwccl/ops/functions/bool/predicates/anntoken.cpp
diff --git a/libwccl/ops/functions/bool/predicates/anntoken.h b/src/libwccl/ops/functions/bool/predicates/anntoken.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/anntoken.h
rename to src/libwccl/ops/functions/bool/predicates/anntoken.h
diff --git a/libwccl/ops/functions/bool/predicates/debug.cpp b/src/libwccl/ops/functions/bool/predicates/debug.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/debug.cpp
rename to src/libwccl/ops/functions/bool/predicates/debug.cpp
diff --git a/libwccl/ops/functions/bool/predicates/debug.h b/src/libwccl/ops/functions/bool/predicates/debug.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/debug.h
rename to src/libwccl/ops/functions/bool/predicates/debug.h
diff --git a/libwccl/ops/functions/bool/predicates/equals.h b/src/libwccl/ops/functions/bool/predicates/equals.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/equals.h
rename to src/libwccl/ops/functions/bool/predicates/equals.h
diff --git a/libwccl/ops/functions/bool/predicates/intersects.h b/src/libwccl/ops/functions/bool/predicates/intersects.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/intersects.h
rename to src/libwccl/ops/functions/bool/predicates/intersects.h
diff --git a/libwccl/ops/functions/bool/predicates/isempty.h b/src/libwccl/ops/functions/bool/predicates/isempty.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/isempty.h
rename to src/libwccl/ops/functions/bool/predicates/isempty.h
diff --git a/libwccl/ops/functions/bool/predicates/isinside.cpp b/src/libwccl/ops/functions/bool/predicates/isinside.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/isinside.cpp
rename to src/libwccl/ops/functions/bool/predicates/isinside.cpp
diff --git a/libwccl/ops/functions/bool/predicates/isinside.h b/src/libwccl/ops/functions/bool/predicates/isinside.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/isinside.h
rename to src/libwccl/ops/functions/bool/predicates/isinside.h
diff --git a/libwccl/ops/functions/bool/predicates/isoutside.cpp b/src/libwccl/ops/functions/bool/predicates/isoutside.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/isoutside.cpp
rename to src/libwccl/ops/functions/bool/predicates/isoutside.cpp
diff --git a/libwccl/ops/functions/bool/predicates/isoutside.h b/src/libwccl/ops/functions/bool/predicates/isoutside.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/isoutside.h
rename to src/libwccl/ops/functions/bool/predicates/isoutside.h
diff --git a/libwccl/ops/functions/bool/predicates/issingular.cpp b/src/libwccl/ops/functions/bool/predicates/issingular.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/issingular.cpp
rename to src/libwccl/ops/functions/bool/predicates/issingular.cpp
diff --git a/libwccl/ops/functions/bool/predicates/issingular.h b/src/libwccl/ops/functions/bool/predicates/issingular.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/issingular.h
rename to src/libwccl/ops/functions/bool/predicates/issingular.h
diff --git a/libwccl/ops/functions/bool/predicates/issubsetof.h b/src/libwccl/ops/functions/bool/predicates/issubsetof.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/issubsetof.h
rename to src/libwccl/ops/functions/bool/predicates/issubsetof.h
diff --git a/libwccl/ops/functions/bool/predicates/logicalpredicate.cpp b/src/libwccl/ops/functions/bool/predicates/logicalpredicate.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/logicalpredicate.cpp
rename to src/libwccl/ops/functions/bool/predicates/logicalpredicate.cpp
diff --git a/libwccl/ops/functions/bool/predicates/logicalpredicate.h b/src/libwccl/ops/functions/bool/predicates/logicalpredicate.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/logicalpredicate.h
rename to src/libwccl/ops/functions/bool/predicates/logicalpredicate.h
diff --git a/libwccl/ops/functions/bool/predicates/nor.cpp b/src/libwccl/ops/functions/bool/predicates/nor.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/nor.cpp
rename to src/libwccl/ops/functions/bool/predicates/nor.cpp
diff --git a/libwccl/ops/functions/bool/predicates/nor.h b/src/libwccl/ops/functions/bool/predicates/nor.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/nor.h
rename to src/libwccl/ops/functions/bool/predicates/nor.h
diff --git a/libwccl/ops/functions/bool/predicates/or.cpp b/src/libwccl/ops/functions/bool/predicates/or.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/or.cpp
rename to src/libwccl/ops/functions/bool/predicates/or.cpp
diff --git a/libwccl/ops/functions/bool/predicates/or.h b/src/libwccl/ops/functions/bool/predicates/or.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/or.h
rename to src/libwccl/ops/functions/bool/predicates/or.h
diff --git a/libwccl/ops/functions/bool/predicates/pointagreement.cpp b/src/libwccl/ops/functions/bool/predicates/pointagreement.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/pointagreement.cpp
rename to src/libwccl/ops/functions/bool/predicates/pointagreement.cpp
diff --git a/libwccl/ops/functions/bool/predicates/pointagreement.h b/src/libwccl/ops/functions/bool/predicates/pointagreement.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/pointagreement.h
rename to src/libwccl/ops/functions/bool/predicates/pointagreement.h
diff --git a/libwccl/ops/functions/bool/predicates/regex.cpp b/src/libwccl/ops/functions/bool/predicates/regex.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/regex.cpp
rename to src/libwccl/ops/functions/bool/predicates/regex.cpp
diff --git a/libwccl/ops/functions/bool/predicates/regex.h b/src/libwccl/ops/functions/bool/predicates/regex.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/regex.h
rename to src/libwccl/ops/functions/bool/predicates/regex.h
diff --git a/libwccl/ops/functions/bool/predicates/setpredicate.h b/src/libwccl/ops/functions/bool/predicates/setpredicate.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/setpredicate.h
rename to src/libwccl/ops/functions/bool/predicates/setpredicate.h
diff --git a/libwccl/ops/functions/bool/predicates/strongagreement.cpp b/src/libwccl/ops/functions/bool/predicates/strongagreement.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/strongagreement.cpp
rename to src/libwccl/ops/functions/bool/predicates/strongagreement.cpp
diff --git a/libwccl/ops/functions/bool/predicates/strongagreement.h b/src/libwccl/ops/functions/bool/predicates/strongagreement.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/strongagreement.h
rename to src/libwccl/ops/functions/bool/predicates/strongagreement.h
diff --git a/libwccl/ops/functions/bool/predicates/weakagreement.cpp b/src/libwccl/ops/functions/bool/predicates/weakagreement.cpp
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/weakagreement.cpp
rename to src/libwccl/ops/functions/bool/predicates/weakagreement.cpp
diff --git a/libwccl/ops/functions/bool/predicates/weakagreement.h b/src/libwccl/ops/functions/bool/predicates/weakagreement.h
similarity index 100%
rename from libwccl/ops/functions/bool/predicates/weakagreement.h
rename to src/libwccl/ops/functions/bool/predicates/weakagreement.h
diff --git a/libwccl/ops/functions/bool/varsetter.h b/src/libwccl/ops/functions/bool/varsetter.h
similarity index 100%
rename from libwccl/ops/functions/bool/varsetter.h
rename to src/libwccl/ops/functions/bool/varsetter.h
diff --git a/libwccl/ops/functions/conditional.h b/src/libwccl/ops/functions/conditional.h
similarity index 100%
rename from libwccl/ops/functions/conditional.h
rename to src/libwccl/ops/functions/conditional.h
diff --git a/libwccl/ops/functions/constant.h b/src/libwccl/ops/functions/constant.h
similarity index 100%
rename from libwccl/ops/functions/constant.h
rename to src/libwccl/ops/functions/constant.h
diff --git a/libwccl/ops/functions/listoperator.h b/src/libwccl/ops/functions/listoperator.h
similarity index 100%
rename from libwccl/ops/functions/listoperator.h
rename to src/libwccl/ops/functions/listoperator.h
diff --git a/libwccl/ops/functions/match/submatch.cpp b/src/libwccl/ops/functions/match/submatch.cpp
similarity index 100%
rename from libwccl/ops/functions/match/submatch.cpp
rename to src/libwccl/ops/functions/match/submatch.cpp
diff --git a/libwccl/ops/functions/match/submatch.h b/src/libwccl/ops/functions/match/submatch.h
similarity index 100%
rename from libwccl/ops/functions/match/submatch.h
rename to src/libwccl/ops/functions/match/submatch.h
diff --git a/libwccl/ops/functions/position/firsttoken.cpp b/src/libwccl/ops/functions/position/firsttoken.cpp
similarity index 100%
rename from libwccl/ops/functions/position/firsttoken.cpp
rename to src/libwccl/ops/functions/position/firsttoken.cpp
diff --git a/libwccl/ops/functions/position/firsttoken.h b/src/libwccl/ops/functions/position/firsttoken.h
similarity index 100%
rename from libwccl/ops/functions/position/firsttoken.h
rename to src/libwccl/ops/functions/position/firsttoken.h
diff --git a/libwccl/ops/functions/position/lasttoken.cpp b/src/libwccl/ops/functions/position/lasttoken.cpp
similarity index 100%
rename from libwccl/ops/functions/position/lasttoken.cpp
rename to src/libwccl/ops/functions/position/lasttoken.cpp
diff --git a/libwccl/ops/functions/position/lasttoken.h b/src/libwccl/ops/functions/position/lasttoken.h
similarity index 100%
rename from libwccl/ops/functions/position/lasttoken.h
rename to src/libwccl/ops/functions/position/lasttoken.h
diff --git a/libwccl/ops/functions/position/relativeposition.cpp b/src/libwccl/ops/functions/position/relativeposition.cpp
similarity index 100%
rename from libwccl/ops/functions/position/relativeposition.cpp
rename to src/libwccl/ops/functions/position/relativeposition.cpp
diff --git a/libwccl/ops/functions/position/relativeposition.h b/src/libwccl/ops/functions/position/relativeposition.h
similarity index 100%
rename from libwccl/ops/functions/position/relativeposition.h
rename to src/libwccl/ops/functions/position/relativeposition.h
diff --git a/libwccl/ops/functions/setops.h b/src/libwccl/ops/functions/setops.h
similarity index 100%
rename from libwccl/ops/functions/setops.h
rename to src/libwccl/ops/functions/setops.h
diff --git a/libwccl/ops/functions/strset/affix.cpp b/src/libwccl/ops/functions/strset/affix.cpp
similarity index 100%
rename from libwccl/ops/functions/strset/affix.cpp
rename to src/libwccl/ops/functions/strset/affix.cpp
diff --git a/libwccl/ops/functions/strset/affix.h b/src/libwccl/ops/functions/strset/affix.h
similarity index 100%
rename from libwccl/ops/functions/strset/affix.h
rename to src/libwccl/ops/functions/strset/affix.h
diff --git a/libwccl/ops/functions/strset/anninter.cpp b/src/libwccl/ops/functions/strset/anninter.cpp
similarity index 100%
rename from libwccl/ops/functions/strset/anninter.cpp
rename to src/libwccl/ops/functions/strset/anninter.cpp
diff --git a/libwccl/ops/functions/strset/anninter.h b/src/libwccl/ops/functions/strset/anninter.h
similarity index 100%
rename from libwccl/ops/functions/strset/anninter.h
rename to src/libwccl/ops/functions/strset/anninter.h
diff --git a/libwccl/ops/functions/strset/getlemmas.cpp b/src/libwccl/ops/functions/strset/getlemmas.cpp
similarity index 100%
rename from libwccl/ops/functions/strset/getlemmas.cpp
rename to src/libwccl/ops/functions/strset/getlemmas.cpp
diff --git a/libwccl/ops/functions/strset/getlemmas.h b/src/libwccl/ops/functions/strset/getlemmas.h
similarity index 100%
rename from libwccl/ops/functions/strset/getlemmas.h
rename to src/libwccl/ops/functions/strset/getlemmas.h
diff --git a/libwccl/ops/functions/strset/getorth.cpp b/src/libwccl/ops/functions/strset/getorth.cpp
similarity index 100%
rename from libwccl/ops/functions/strset/getorth.cpp
rename to src/libwccl/ops/functions/strset/getorth.cpp
diff --git a/libwccl/ops/functions/strset/getorth.h b/src/libwccl/ops/functions/strset/getorth.h
similarity index 100%
rename from libwccl/ops/functions/strset/getorth.h
rename to src/libwccl/ops/functions/strset/getorth.h
diff --git a/libwccl/ops/functions/strset/lextranslator.cpp b/src/libwccl/ops/functions/strset/lextranslator.cpp
similarity index 100%
rename from libwccl/ops/functions/strset/lextranslator.cpp
rename to src/libwccl/ops/functions/strset/lextranslator.cpp
diff --git a/libwccl/ops/functions/strset/lextranslator.h b/src/libwccl/ops/functions/strset/lextranslator.h
similarity index 100%
rename from libwccl/ops/functions/strset/lextranslator.h
rename to src/libwccl/ops/functions/strset/lextranslator.h
diff --git a/libwccl/ops/functions/strset/propval.cpp b/src/libwccl/ops/functions/strset/propval.cpp
similarity index 100%
rename from libwccl/ops/functions/strset/propval.cpp
rename to src/libwccl/ops/functions/strset/propval.cpp
diff --git a/libwccl/ops/functions/strset/propval.h b/src/libwccl/ops/functions/strset/propval.h
similarity index 100%
rename from libwccl/ops/functions/strset/propval.h
rename to src/libwccl/ops/functions/strset/propval.h
diff --git a/libwccl/ops/functions/strset/tolower.cpp b/src/libwccl/ops/functions/strset/tolower.cpp
similarity index 100%
rename from libwccl/ops/functions/strset/tolower.cpp
rename to src/libwccl/ops/functions/strset/tolower.cpp
diff --git a/libwccl/ops/functions/strset/tolower.h b/src/libwccl/ops/functions/strset/tolower.h
similarity index 100%
rename from libwccl/ops/functions/strset/tolower.h
rename to src/libwccl/ops/functions/strset/tolower.h
diff --git a/libwccl/ops/functions/strset/toupper.cpp b/src/libwccl/ops/functions/strset/toupper.cpp
similarity index 100%
rename from libwccl/ops/functions/strset/toupper.cpp
rename to src/libwccl/ops/functions/strset/toupper.cpp
diff --git a/libwccl/ops/functions/strset/toupper.h b/src/libwccl/ops/functions/strset/toupper.h
similarity index 100%
rename from libwccl/ops/functions/strset/toupper.h
rename to src/libwccl/ops/functions/strset/toupper.h
diff --git a/libwccl/ops/functions/tset/agrfilter.cpp b/src/libwccl/ops/functions/tset/agrfilter.cpp
similarity index 100%
rename from libwccl/ops/functions/tset/agrfilter.cpp
rename to src/libwccl/ops/functions/tset/agrfilter.cpp
diff --git a/libwccl/ops/functions/tset/agrfilter.h b/src/libwccl/ops/functions/tset/agrfilter.h
similarity index 100%
rename from libwccl/ops/functions/tset/agrfilter.h
rename to src/libwccl/ops/functions/tset/agrfilter.h
diff --git a/libwccl/ops/functions/tset/catfilter.cpp b/src/libwccl/ops/functions/tset/catfilter.cpp
similarity index 100%
rename from libwccl/ops/functions/tset/catfilter.cpp
rename to src/libwccl/ops/functions/tset/catfilter.cpp
diff --git a/libwccl/ops/functions/tset/catfilter.h b/src/libwccl/ops/functions/tset/catfilter.h
similarity index 100%
rename from libwccl/ops/functions/tset/catfilter.h
rename to src/libwccl/ops/functions/tset/catfilter.h
diff --git a/libwccl/ops/functions/tset/getsymbols.cpp b/src/libwccl/ops/functions/tset/getsymbols.cpp
similarity index 100%
rename from libwccl/ops/functions/tset/getsymbols.cpp
rename to src/libwccl/ops/functions/tset/getsymbols.cpp
diff --git a/libwccl/ops/functions/tset/getsymbols.h b/src/libwccl/ops/functions/tset/getsymbols.h
similarity index 100%
rename from libwccl/ops/functions/tset/getsymbols.h
rename to src/libwccl/ops/functions/tset/getsymbols.h
diff --git a/libwccl/ops/functions/tset/getsymbolsinrange.cpp b/src/libwccl/ops/functions/tset/getsymbolsinrange.cpp
similarity index 100%
rename from libwccl/ops/functions/tset/getsymbolsinrange.cpp
rename to src/libwccl/ops/functions/tset/getsymbolsinrange.cpp
diff --git a/libwccl/ops/functions/tset/getsymbolsinrange.h b/src/libwccl/ops/functions/tset/getsymbolsinrange.h
similarity index 100%
rename from libwccl/ops/functions/tset/getsymbolsinrange.h
rename to src/libwccl/ops/functions/tset/getsymbolsinrange.h
diff --git a/libwccl/ops/functions/tset/getwordclass.h b/src/libwccl/ops/functions/tset/getwordclass.h
similarity index 100%
rename from libwccl/ops/functions/tset/getwordclass.h
rename to src/libwccl/ops/functions/tset/getwordclass.h
diff --git a/libwccl/ops/functions/vargetter.h b/src/libwccl/ops/functions/vargetter.h
similarity index 100%
rename from libwccl/ops/functions/vargetter.h
rename to src/libwccl/ops/functions/vargetter.h
diff --git a/libwccl/ops/funexeccontext.h b/src/libwccl/ops/funexeccontext.h
similarity index 100%
rename from libwccl/ops/funexeccontext.h
rename to src/libwccl/ops/funexeccontext.h
diff --git a/libwccl/ops/match/actions/markbase.cpp b/src/libwccl/ops/match/actions/markbase.cpp
similarity index 100%
rename from libwccl/ops/match/actions/markbase.cpp
rename to src/libwccl/ops/match/actions/markbase.cpp
diff --git a/libwccl/ops/match/actions/markbase.h b/src/libwccl/ops/match/actions/markbase.h
similarity index 100%
rename from libwccl/ops/match/actions/markbase.h
rename to src/libwccl/ops/match/actions/markbase.h
diff --git a/libwccl/ops/match/actions/markmatch.cpp b/src/libwccl/ops/match/actions/markmatch.cpp
similarity index 100%
rename from libwccl/ops/match/actions/markmatch.cpp
rename to src/libwccl/ops/match/actions/markmatch.cpp
diff --git a/libwccl/ops/match/actions/markmatch.h b/src/libwccl/ops/match/actions/markmatch.h
similarity index 100%
rename from libwccl/ops/match/actions/markmatch.h
rename to src/libwccl/ops/match/actions/markmatch.h
diff --git a/libwccl/ops/match/actions/overwritematch.cpp b/src/libwccl/ops/match/actions/overwritematch.cpp
similarity index 100%
rename from libwccl/ops/match/actions/overwritematch.cpp
rename to src/libwccl/ops/match/actions/overwritematch.cpp
diff --git a/libwccl/ops/match/actions/overwritematch.h b/src/libwccl/ops/match/actions/overwritematch.h
similarity index 100%
rename from libwccl/ops/match/actions/overwritematch.h
rename to src/libwccl/ops/match/actions/overwritematch.h
diff --git a/libwccl/ops/match/actions/setpropmatch.cpp b/src/libwccl/ops/match/actions/setpropmatch.cpp
similarity index 100%
rename from libwccl/ops/match/actions/setpropmatch.cpp
rename to src/libwccl/ops/match/actions/setpropmatch.cpp
diff --git a/libwccl/ops/match/actions/setpropmatch.h b/src/libwccl/ops/match/actions/setpropmatch.h
similarity index 100%
rename from libwccl/ops/match/actions/setpropmatch.h
rename to src/libwccl/ops/match/actions/setpropmatch.h
diff --git a/libwccl/ops/match/actions/unmarkmatch.cpp b/src/libwccl/ops/match/actions/unmarkmatch.cpp
similarity index 100%
rename from libwccl/ops/match/actions/unmarkmatch.cpp
rename to src/libwccl/ops/match/actions/unmarkmatch.cpp
diff --git a/libwccl/ops/match/actions/unmarkmatch.h b/src/libwccl/ops/match/actions/unmarkmatch.h
similarity index 100%
rename from libwccl/ops/match/actions/unmarkmatch.h
rename to src/libwccl/ops/match/actions/unmarkmatch.h
diff --git a/libwccl/ops/match/applyoperator.cpp b/src/libwccl/ops/match/applyoperator.cpp
similarity index 100%
rename from libwccl/ops/match/applyoperator.cpp
rename to src/libwccl/ops/match/applyoperator.cpp
diff --git a/libwccl/ops/match/applyoperator.h b/src/libwccl/ops/match/applyoperator.h
similarity index 100%
rename from libwccl/ops/match/applyoperator.h
rename to src/libwccl/ops/match/applyoperator.h
diff --git a/libwccl/ops/match/conditions/conjconditions.cpp b/src/libwccl/ops/match/conditions/conjconditions.cpp
similarity index 100%
rename from libwccl/ops/match/conditions/conjconditions.cpp
rename to src/libwccl/ops/match/conditions/conjconditions.cpp
diff --git a/libwccl/ops/match/conditions/conjconditions.h b/src/libwccl/ops/match/conditions/conjconditions.h
similarity index 100%
rename from libwccl/ops/match/conditions/conjconditions.h
rename to src/libwccl/ops/match/conditions/conjconditions.h
diff --git a/libwccl/ops/match/conditions/isannotatedas.cpp b/src/libwccl/ops/match/conditions/isannotatedas.cpp
similarity index 100%
rename from libwccl/ops/match/conditions/isannotatedas.cpp
rename to src/libwccl/ops/match/conditions/isannotatedas.cpp
diff --git a/libwccl/ops/match/conditions/isannotatedas.h b/src/libwccl/ops/match/conditions/isannotatedas.h
similarity index 100%
rename from libwccl/ops/match/conditions/isannotatedas.h
rename to src/libwccl/ops/match/conditions/isannotatedas.h
diff --git a/libwccl/ops/match/conditions/longest.cpp b/src/libwccl/ops/match/conditions/longest.cpp
similarity index 100%
rename from libwccl/ops/match/conditions/longest.cpp
rename to src/libwccl/ops/match/conditions/longest.cpp
diff --git a/libwccl/ops/match/conditions/longest.h b/src/libwccl/ops/match/conditions/longest.h
similarity index 100%
rename from libwccl/ops/match/conditions/longest.h
rename to src/libwccl/ops/match/conditions/longest.h
diff --git a/libwccl/ops/match/conditions/matchtext.cpp b/src/libwccl/ops/match/conditions/matchtext.cpp
similarity index 100%
rename from libwccl/ops/match/conditions/matchtext.cpp
rename to src/libwccl/ops/match/conditions/matchtext.cpp
diff --git a/libwccl/ops/match/conditions/matchtext.h b/src/libwccl/ops/match/conditions/matchtext.h
similarity index 100%
rename from libwccl/ops/match/conditions/matchtext.h
rename to src/libwccl/ops/match/conditions/matchtext.h
diff --git a/libwccl/ops/match/conditions/oneof.cpp b/src/libwccl/ops/match/conditions/oneof.cpp
similarity index 100%
rename from libwccl/ops/match/conditions/oneof.cpp
rename to src/libwccl/ops/match/conditions/oneof.cpp
diff --git a/libwccl/ops/match/conditions/oneof.h b/src/libwccl/ops/match/conditions/oneof.h
similarity index 100%
rename from libwccl/ops/match/conditions/oneof.h
rename to src/libwccl/ops/match/conditions/oneof.h
diff --git a/libwccl/ops/match/conditions/optionalmatch.cpp b/src/libwccl/ops/match/conditions/optionalmatch.cpp
similarity index 100%
rename from libwccl/ops/match/conditions/optionalmatch.cpp
rename to src/libwccl/ops/match/conditions/optionalmatch.cpp
diff --git a/libwccl/ops/match/conditions/optionalmatch.h b/src/libwccl/ops/match/conditions/optionalmatch.h
similarity index 100%
rename from libwccl/ops/match/conditions/optionalmatch.h
rename to src/libwccl/ops/match/conditions/optionalmatch.h
diff --git a/libwccl/ops/match/conditions/repeatedmatch.cpp b/src/libwccl/ops/match/conditions/repeatedmatch.cpp
similarity index 100%
rename from libwccl/ops/match/conditions/repeatedmatch.cpp
rename to src/libwccl/ops/match/conditions/repeatedmatch.cpp
diff --git a/libwccl/ops/match/conditions/repeatedmatch.h b/src/libwccl/ops/match/conditions/repeatedmatch.h
similarity index 100%
rename from libwccl/ops/match/conditions/repeatedmatch.h
rename to src/libwccl/ops/match/conditions/repeatedmatch.h
diff --git a/libwccl/ops/match/conditions/tokencondition.cpp b/src/libwccl/ops/match/conditions/tokencondition.cpp
similarity index 100%
rename from libwccl/ops/match/conditions/tokencondition.cpp
rename to src/libwccl/ops/match/conditions/tokencondition.cpp
diff --git a/libwccl/ops/match/conditions/tokencondition.h b/src/libwccl/ops/match/conditions/tokencondition.h
similarity index 100%
rename from libwccl/ops/match/conditions/tokencondition.h
rename to src/libwccl/ops/match/conditions/tokencondition.h
diff --git a/libwccl/ops/match/matchaction.h b/src/libwccl/ops/match/matchaction.h
similarity index 100%
rename from libwccl/ops/match/matchaction.h
rename to src/libwccl/ops/match/matchaction.h
diff --git a/libwccl/ops/match/matchcondition.h b/src/libwccl/ops/match/matchcondition.h
similarity index 100%
rename from libwccl/ops/match/matchcondition.h
rename to src/libwccl/ops/match/matchcondition.h
diff --git a/libwccl/ops/match/matchresult.h b/src/libwccl/ops/match/matchresult.h
similarity index 100%
rename from libwccl/ops/match/matchresult.h
rename to src/libwccl/ops/match/matchresult.h
diff --git a/libwccl/ops/matchrule.cpp b/src/libwccl/ops/matchrule.cpp
similarity index 100%
rename from libwccl/ops/matchrule.cpp
rename to src/libwccl/ops/matchrule.cpp
diff --git a/libwccl/ops/matchrule.h b/src/libwccl/ops/matchrule.h
similarity index 100%
rename from libwccl/ops/matchrule.h
rename to src/libwccl/ops/matchrule.h
diff --git a/libwccl/ops/matchrulesequence.cpp b/src/libwccl/ops/matchrulesequence.cpp
similarity index 100%
rename from libwccl/ops/matchrulesequence.cpp
rename to src/libwccl/ops/matchrulesequence.cpp
diff --git a/libwccl/ops/matchrulesequence.h b/src/libwccl/ops/matchrulesequence.h
similarity index 100%
rename from libwccl/ops/matchrulesequence.h
rename to src/libwccl/ops/matchrulesequence.h
diff --git a/libwccl/ops/operator.h b/src/libwccl/ops/operator.h
similarity index 100%
rename from libwccl/ops/operator.h
rename to src/libwccl/ops/operator.h
diff --git a/libwccl/ops/opsequence.cpp b/src/libwccl/ops/opsequence.cpp
similarity index 100%
rename from libwccl/ops/opsequence.cpp
rename to src/libwccl/ops/opsequence.cpp
diff --git a/libwccl/ops/opsequence.h b/src/libwccl/ops/opsequence.h
similarity index 100%
rename from libwccl/ops/opsequence.h
rename to src/libwccl/ops/opsequence.h
diff --git a/libwccl/ops/parsedexpression.h b/src/libwccl/ops/parsedexpression.h
similarity index 100%
rename from libwccl/ops/parsedexpression.h
rename to src/libwccl/ops/parsedexpression.h
diff --git a/libwccl/ops/tagaction.cpp b/src/libwccl/ops/tagaction.cpp
similarity index 100%
rename from libwccl/ops/tagaction.cpp
rename to src/libwccl/ops/tagaction.cpp
diff --git a/libwccl/ops/tagaction.h b/src/libwccl/ops/tagaction.h
similarity index 100%
rename from libwccl/ops/tagaction.h
rename to src/libwccl/ops/tagaction.h
diff --git a/libwccl/ops/tagactions/delete.cpp b/src/libwccl/ops/tagactions/delete.cpp
similarity index 100%
rename from libwccl/ops/tagactions/delete.cpp
rename to src/libwccl/ops/tagactions/delete.cpp
diff --git a/libwccl/ops/tagactions/delete.h b/src/libwccl/ops/tagactions/delete.h
similarity index 100%
rename from libwccl/ops/tagactions/delete.h
rename to src/libwccl/ops/tagactions/delete.h
diff --git a/libwccl/ops/tagactions/mark.cpp b/src/libwccl/ops/tagactions/mark.cpp
similarity index 100%
rename from libwccl/ops/tagactions/mark.cpp
rename to src/libwccl/ops/tagactions/mark.cpp
diff --git a/libwccl/ops/tagactions/mark.h b/src/libwccl/ops/tagactions/mark.h
similarity index 100%
rename from libwccl/ops/tagactions/mark.h
rename to src/libwccl/ops/tagactions/mark.h
diff --git a/libwccl/ops/tagactions/relabel.cpp b/src/libwccl/ops/tagactions/relabel.cpp
similarity index 100%
rename from libwccl/ops/tagactions/relabel.cpp
rename to src/libwccl/ops/tagactions/relabel.cpp
diff --git a/libwccl/ops/tagactions/relabel.h b/src/libwccl/ops/tagactions/relabel.h
similarity index 100%
rename from libwccl/ops/tagactions/relabel.h
rename to src/libwccl/ops/tagactions/relabel.h
diff --git a/libwccl/ops/tagactions/select.cpp b/src/libwccl/ops/tagactions/select.cpp
similarity index 100%
rename from libwccl/ops/tagactions/select.cpp
rename to src/libwccl/ops/tagactions/select.cpp
diff --git a/libwccl/ops/tagactions/select.h b/src/libwccl/ops/tagactions/select.h
similarity index 100%
rename from libwccl/ops/tagactions/select.h
rename to src/libwccl/ops/tagactions/select.h
diff --git a/libwccl/ops/tagactions/unify.cpp b/src/libwccl/ops/tagactions/unify.cpp
similarity index 100%
rename from libwccl/ops/tagactions/unify.cpp
rename to src/libwccl/ops/tagactions/unify.cpp
diff --git a/libwccl/ops/tagactions/unify.h b/src/libwccl/ops/tagactions/unify.h
similarity index 100%
rename from libwccl/ops/tagactions/unify.h
rename to src/libwccl/ops/tagactions/unify.h
diff --git a/libwccl/ops/tagactions/unmark.cpp b/src/libwccl/ops/tagactions/unmark.cpp
similarity index 100%
rename from libwccl/ops/tagactions/unmark.cpp
rename to src/libwccl/ops/tagactions/unmark.cpp
diff --git a/libwccl/ops/tagactions/unmark.h b/src/libwccl/ops/tagactions/unmark.h
similarity index 100%
rename from libwccl/ops/tagactions/unmark.h
rename to src/libwccl/ops/tagactions/unmark.h
diff --git a/libwccl/ops/tagrule.cpp b/src/libwccl/ops/tagrule.cpp
similarity index 100%
rename from libwccl/ops/tagrule.cpp
rename to src/libwccl/ops/tagrule.cpp
diff --git a/libwccl/ops/tagrule.h b/src/libwccl/ops/tagrule.h
similarity index 100%
rename from libwccl/ops/tagrule.h
rename to src/libwccl/ops/tagrule.h
diff --git a/libwccl/ops/tagrulesequence.cpp b/src/libwccl/ops/tagrulesequence.cpp
similarity index 100%
rename from libwccl/ops/tagrulesequence.cpp
rename to src/libwccl/ops/tagrulesequence.cpp
diff --git a/libwccl/ops/tagrulesequence.h b/src/libwccl/ops/tagrulesequence.h
similarity index 100%
rename from libwccl/ops/tagrulesequence.h
rename to src/libwccl/ops/tagrulesequence.h
diff --git a/libwccl/parser/ANTLRParserResult.h b/src/libwccl/parser/ANTLRParserResult.h
similarity index 100%
rename from libwccl/parser/ANTLRParserResult.h
rename to src/libwccl/parser/ANTLRParserResult.h
diff --git a/libwccl/parser/Parser.cpp b/src/libwccl/parser/Parser.cpp
similarity index 100%
rename from libwccl/parser/Parser.cpp
rename to src/libwccl/parser/Parser.cpp
diff --git a/libwccl/parser/Parser.h b/src/libwccl/parser/Parser.h
similarity index 100%
rename from libwccl/parser/Parser.h
rename to src/libwccl/parser/Parser.h
diff --git a/libwccl/parser/ParserException.cpp b/src/libwccl/parser/ParserException.cpp
similarity index 100%
rename from libwccl/parser/ParserException.cpp
rename to src/libwccl/parser/ParserException.cpp
diff --git a/libwccl/parser/ParserException.h b/src/libwccl/parser/ParserException.h
similarity index 100%
rename from libwccl/parser/ParserException.h
rename to src/libwccl/parser/ParserException.h
diff --git a/libwccl/parser/grammar.g b/src/libwccl/parser/grammar.g
similarity index 100%
rename from libwccl/parser/grammar.g
rename to src/libwccl/parser/grammar.g
diff --git a/libwccl/parser/parsingscope.h b/src/libwccl/parser/parsingscope.h
similarity index 100%
rename from libwccl/parser/parsingscope.h
rename to src/libwccl/parser/parsingscope.h
diff --git a/libwccl/sentencecontext.cpp b/src/libwccl/sentencecontext.cpp
similarity index 100%
rename from libwccl/sentencecontext.cpp
rename to src/libwccl/sentencecontext.cpp
diff --git a/libwccl/sentencecontext.h b/src/libwccl/sentencecontext.h
similarity index 100%
rename from libwccl/sentencecontext.h
rename to src/libwccl/sentencecontext.h
diff --git a/libwccl/values/annotationmatch.cpp b/src/libwccl/values/annotationmatch.cpp
similarity index 100%
rename from libwccl/values/annotationmatch.cpp
rename to src/libwccl/values/annotationmatch.cpp
diff --git a/libwccl/values/annotationmatch.h b/src/libwccl/values/annotationmatch.h
similarity index 100%
rename from libwccl/values/annotationmatch.h
rename to src/libwccl/values/annotationmatch.h
diff --git a/libwccl/values/bool.cpp b/src/libwccl/values/bool.cpp
similarity index 100%
rename from libwccl/values/bool.cpp
rename to src/libwccl/values/bool.cpp
diff --git a/libwccl/values/bool.h b/src/libwccl/values/bool.h
similarity index 100%
rename from libwccl/values/bool.h
rename to src/libwccl/values/bool.h
diff --git a/libwccl/values/match.cpp b/src/libwccl/values/match.cpp
similarity index 100%
rename from libwccl/values/match.cpp
rename to src/libwccl/values/match.cpp
diff --git a/libwccl/values/match.h b/src/libwccl/values/match.h
similarity index 100%
rename from libwccl/values/match.h
rename to src/libwccl/values/match.h
diff --git a/libwccl/values/matchdata.h b/src/libwccl/values/matchdata.h
similarity index 100%
rename from libwccl/values/matchdata.h
rename to src/libwccl/values/matchdata.h
diff --git a/libwccl/values/matchvector.cpp b/src/libwccl/values/matchvector.cpp
similarity index 100%
rename from libwccl/values/matchvector.cpp
rename to src/libwccl/values/matchvector.cpp
diff --git a/libwccl/values/matchvector.h b/src/libwccl/values/matchvector.h
similarity index 100%
rename from libwccl/values/matchvector.h
rename to src/libwccl/values/matchvector.h
diff --git a/libwccl/values/position.cpp b/src/libwccl/values/position.cpp
similarity index 100%
rename from libwccl/values/position.cpp
rename to src/libwccl/values/position.cpp
diff --git a/libwccl/values/position.h b/src/libwccl/values/position.h
similarity index 100%
rename from libwccl/values/position.h
rename to src/libwccl/values/position.h
diff --git a/libwccl/values/strset.cpp b/src/libwccl/values/strset.cpp
similarity index 100%
rename from libwccl/values/strset.cpp
rename to src/libwccl/values/strset.cpp
diff --git a/libwccl/values/strset.h b/src/libwccl/values/strset.h
similarity index 100%
rename from libwccl/values/strset.h
rename to src/libwccl/values/strset.h
diff --git a/libwccl/values/tokenmatch.cpp b/src/libwccl/values/tokenmatch.cpp
similarity index 100%
rename from libwccl/values/tokenmatch.cpp
rename to src/libwccl/values/tokenmatch.cpp
diff --git a/libwccl/values/tokenmatch.h b/src/libwccl/values/tokenmatch.h
similarity index 100%
rename from libwccl/values/tokenmatch.h
rename to src/libwccl/values/tokenmatch.h
diff --git a/libwccl/values/tset.cpp b/src/libwccl/values/tset.cpp
similarity index 100%
rename from libwccl/values/tset.cpp
rename to src/libwccl/values/tset.cpp
diff --git a/libwccl/values/tset.h b/src/libwccl/values/tset.h
similarity index 100%
rename from libwccl/values/tset.h
rename to src/libwccl/values/tset.h
diff --git a/libwccl/values/value.cpp b/src/libwccl/values/value.cpp
similarity index 100%
rename from libwccl/values/value.cpp
rename to src/libwccl/values/value.cpp
diff --git a/libwccl/values/value.h b/src/libwccl/values/value.h
similarity index 100%
rename from libwccl/values/value.h
rename to src/libwccl/values/value.h
diff --git a/libwccl/variables.cpp b/src/libwccl/variables.cpp
similarity index 100%
rename from libwccl/variables.cpp
rename to src/libwccl/variables.cpp
diff --git a/libwccl/variables.h b/src/libwccl/variables.h
similarity index 100%
rename from libwccl/variables.h
rename to src/libwccl/variables.h
diff --git a/libwccl/version.in b/src/libwccl/version.in
similarity index 100%
rename from libwccl/version.in
rename to src/libwccl/version.in
diff --git a/libwccl/wcclfile.cpp b/src/libwccl/wcclfile.cpp
similarity index 100%
rename from libwccl/wcclfile.cpp
rename to src/libwccl/wcclfile.cpp
diff --git a/libwccl/wcclfile.h b/src/libwccl/wcclfile.h
similarity index 100%
rename from libwccl/wcclfile.h
rename to src/libwccl/wcclfile.h
diff --git a/libwccl/wcclfileopsections.h b/src/libwccl/wcclfileopsections.h
similarity index 100%
rename from libwccl/wcclfileopsections.h
rename to src/libwccl/wcclfileopsections.h
diff --git a/swig/CMakeLists.txt b/src/swig/CMakeLists.txt
similarity index 100%
rename from swig/CMakeLists.txt
rename to src/swig/CMakeLists.txt
diff --git a/swig/actionexeccontext.i b/src/swig/actionexeccontext.i
similarity index 100%
rename from swig/actionexeccontext.i
rename to src/swig/actionexeccontext.i
diff --git a/swig/annotationmatch.i b/src/swig/annotationmatch.i
similarity index 100%
rename from swig/annotationmatch.i
rename to src/swig/annotationmatch.i
diff --git a/swig/bool.i b/src/swig/bool.i
similarity index 100%
rename from swig/bool.i
rename to src/swig/bool.i
diff --git a/swig/exception.i b/src/swig/exception.i
similarity index 100%
rename from swig/exception.i
rename to src/swig/exception.i
diff --git a/swig/expression.i b/src/swig/expression.i
similarity index 100%
rename from swig/expression.i
rename to src/swig/expression.i
diff --git a/swig/functionaloperator.i b/src/swig/functionaloperator.i
similarity index 100%
rename from swig/functionaloperator.i
rename to src/swig/functionaloperator.i
diff --git a/swig/functionalopsequence.i b/src/swig/functionalopsequence.i
similarity index 100%
rename from swig/functionalopsequence.i
rename to src/swig/functionalopsequence.i
diff --git a/swig/lexicon.i b/src/swig/lexicon.i
similarity index 100%
rename from swig/lexicon.i
rename to src/swig/lexicon.i
diff --git a/swig/lexicons.i b/src/swig/lexicons.i
similarity index 100%
rename from swig/lexicons.i
rename to src/swig/lexicons.i
diff --git a/swig/makewrapper.sh b/src/swig/makewrapper.sh
similarity index 100%
rename from swig/makewrapper.sh
rename to src/swig/makewrapper.sh
diff --git a/swig/match.i b/src/swig/match.i
similarity index 100%
rename from swig/match.i
rename to src/swig/match.i
diff --git a/swig/matchdata.i b/src/swig/matchdata.i
similarity index 100%
rename from swig/matchdata.i
rename to src/swig/matchdata.i
diff --git a/swig/matchrule.i b/src/swig/matchrule.i
similarity index 100%
rename from swig/matchrule.i
rename to src/swig/matchrule.i
diff --git a/swig/matchrulesequence.i b/src/swig/matchrulesequence.i
similarity index 100%
rename from swig/matchrulesequence.i
rename to src/swig/matchrulesequence.i
diff --git a/swig/matchvector.i b/src/swig/matchvector.i
similarity index 100%
rename from swig/matchvector.i
rename to src/swig/matchvector.i
diff --git a/swig/operator.i b/src/swig/operator.i
similarity index 100%
rename from swig/operator.i
rename to src/swig/operator.i
diff --git a/swig/parsedexpression.i b/src/swig/parsedexpression.i
similarity index 100%
rename from swig/parsedexpression.i
rename to src/swig/parsedexpression.i
diff --git a/swig/parser.i b/src/swig/parser.i
similarity index 100%
rename from swig/parser.i
rename to src/swig/parser.i
diff --git a/swig/position.i b/src/swig/position.i
similarity index 100%
rename from swig/position.i
rename to src/swig/position.i
diff --git a/swig/sentencecontext.i b/src/swig/sentencecontext.i
similarity index 100%
rename from swig/sentencecontext.i
rename to src/swig/sentencecontext.i
diff --git a/swig/strset.i b/src/swig/strset.i
similarity index 100%
rename from swig/strset.i
rename to src/swig/strset.i
diff --git a/swig/swig_template_wccl.template b/src/swig/swig_template_wccl.template
similarity index 100%
rename from swig/swig_template_wccl.template
rename to src/swig/swig_template_wccl.template
diff --git a/swig/tagaction.i b/src/swig/tagaction.i
similarity index 100%
rename from swig/tagaction.i
rename to src/swig/tagaction.i
diff --git a/swig/tagrule.i b/src/swig/tagrule.i
similarity index 100%
rename from swig/tagrule.i
rename to src/swig/tagrule.i
diff --git a/swig/tagrulesequence.i b/src/swig/tagrulesequence.i
similarity index 100%
rename from swig/tagrulesequence.i
rename to src/swig/tagrulesequence.i
diff --git a/swig/tokenmatch.i b/src/swig/tokenmatch.i
similarity index 100%
rename from swig/tokenmatch.i
rename to src/swig/tokenmatch.i
diff --git a/swig/tset.i b/src/swig/tset.i
similarity index 100%
rename from swig/tset.i
rename to src/swig/tset.i
diff --git a/swig/value.i b/src/swig/value.i
similarity index 100%
rename from swig/value.i
rename to src/swig/value.i
diff --git a/swig/variables.i b/src/swig/variables.i
similarity index 100%
rename from swig/variables.i
rename to src/swig/variables.i
diff --git a/swig/wccl.i b/src/swig/wccl.i
similarity index 100%
rename from swig/wccl.i
rename to src/swig/wccl.i
diff --git a/swig/wcclfile.i b/src/swig/wcclfile.i
similarity index 100%
rename from swig/wcclfile.i
rename to src/swig/wcclfile.i
diff --git a/swig/wcclfileopsections.i b/src/swig/wcclfileopsections.i
similarity index 100%
rename from swig/wcclfileopsections.i
rename to src/swig/wcclfileopsections.i
diff --git a/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
similarity index 100%
rename from tests/CMakeLists.txt
rename to src/tests/CMakeLists.txt
diff --git a/tests/ann_op.cpp b/src/tests/ann_op.cpp
similarity index 100%
rename from tests/ann_op.cpp
rename to src/tests/ann_op.cpp
diff --git a/tests/conditional.cpp b/src/tests/conditional.cpp
similarity index 100%
rename from tests/conditional.cpp
rename to src/tests/conditional.cpp
diff --git a/tests/constant.cpp b/src/tests/constant.cpp
similarity index 100%
rename from tests/constant.cpp
rename to src/tests/constant.cpp
diff --git a/tests/context.cpp b/src/tests/context.cpp
similarity index 100%
rename from tests/context.cpp
rename to src/tests/context.cpp
diff --git a/tests/data/agreement/agr1.ccl b/src/tests/data/agreement/agr1.ccl
similarity index 100%
rename from tests/data/agreement/agr1.ccl
rename to src/tests/data/agreement/agr1.ccl
diff --git a/tests/data/agreement/agrflt1.ccl b/src/tests/data/agreement/agrflt1.ccl
similarity index 100%
rename from tests/data/agreement/agrflt1.ccl
rename to src/tests/data/agreement/agrflt1.ccl
diff --git a/tests/data/agreement/agrpp1.ccl b/src/tests/data/agreement/agrpp1.ccl
similarity index 100%
rename from tests/data/agreement/agrpp1.ccl
rename to src/tests/data/agreement/agrpp1.ccl
diff --git a/tests/data/agreement/agrpp2.ccl b/src/tests/data/agreement/agrpp2.ccl
similarity index 100%
rename from tests/data/agreement/agrpp2.ccl
rename to src/tests/data/agreement/agrpp2.ccl
diff --git a/tests/data/agreement/kobieta.xml b/src/tests/data/agreement/kobieta.xml
similarity index 100%
rename from tests/data/agreement/kobieta.xml
rename to src/tests/data/agreement/kobieta.xml
diff --git a/tests/data/agreement/mamut.xml b/src/tests/data/agreement/mamut.xml
similarity index 100%
rename from tests/data/agreement/mamut.xml
rename to src/tests/data/agreement/mamut.xml
diff --git a/tests/data/agreement/nadzieje.xml b/src/tests/data/agreement/nadzieje.xml
similarity index 100%
rename from tests/data/agreement/nadzieje.xml
rename to src/tests/data/agreement/nadzieje.xml
diff --git a/tests/data/agreement/wagr1.ccl b/src/tests/data/agreement/wagr1.ccl
similarity index 100%
rename from tests/data/agreement/wagr1.ccl
rename to src/tests/data/agreement/wagr1.ccl
diff --git a/tests/data/agreement/wagr2.ccl b/src/tests/data/agreement/wagr2.ccl
similarity index 100%
rename from tests/data/agreement/wagr2.ccl
rename to src/tests/data/agreement/wagr2.ccl
diff --git a/tests/data/agreement/wagr3.ccl b/src/tests/data/agreement/wagr3.ccl
similarity index 100%
rename from tests/data/agreement/wagr3.ccl
rename to src/tests/data/agreement/wagr3.ccl
diff --git a/tests/data/basic.ccl b/src/tests/data/basic.ccl
similarity index 100%
rename from tests/data/basic.ccl
rename to src/tests/data/basic.ccl
diff --git a/tests/data/class.ccl b/src/tests/data/class.ccl
similarity index 100%
rename from tests/data/class.ccl
rename to src/tests/data/class.ccl
diff --git a/tests/data/crossing.ccl b/src/tests/data/crossing.ccl
similarity index 100%
rename from tests/data/crossing.ccl
rename to src/tests/data/crossing.ccl
diff --git a/tests/data/example.ccl b/src/tests/data/example.ccl
similarity index 100%
rename from tests/data/example.ccl
rename to src/tests/data/example.ccl
diff --git a/tests/data/indecl.lex b/src/tests/data/indecl.lex
similarity index 100%
rename from tests/data/indecl.lex
rename to src/tests/data/indecl.lex
diff --git a/tests/data/indecl.wccl b/src/tests/data/indecl.wccl
similarity index 100%
rename from tests/data/indecl.wccl
rename to src/tests/data/indecl.wccl
diff --git a/tests/data/interp.xml b/src/tests/data/interp.xml
similarity index 100%
rename from tests/data/interp.xml
rename to src/tests/data/interp.xml
diff --git a/tests/data/iterations.ccl b/src/tests/data/iterations.ccl
similarity index 100%
rename from tests/data/iterations.ccl
rename to src/tests/data/iterations.ccl
diff --git a/tests/data/lex_test.ccl b/src/tests/data/lex_test.ccl
similarity index 100%
rename from tests/data/lex_test.ccl
rename to src/tests/data/lex_test.ccl
diff --git a/tests/data/nest_if.ccl b/src/tests/data/nest_if.ccl
similarity index 100%
rename from tests/data/nest_if.ccl
rename to src/tests/data/nest_if.ccl
diff --git a/tests/data/range.ccl b/src/tests/data/range.ccl
similarity index 100%
rename from tests/data/range.ccl
rename to src/tests/data/range.ccl
diff --git a/tests/data/sentence.ccl b/src/tests/data/sentence.ccl
similarity index 100%
rename from tests/data/sentence.ccl
rename to src/tests/data/sentence.ccl
diff --git a/tests/data/setops.ccl b/src/tests/data/setops.ccl
similarity index 100%
rename from tests/data/setops.ccl
rename to src/tests/data/setops.ccl
diff --git a/tests/data/singular.ccl b/src/tests/data/singular.ccl
similarity index 100%
rename from tests/data/singular.ccl
rename to src/tests/data/singular.ccl
diff --git a/tests/data/skip-iter.ccl b/src/tests/data/skip-iter.ccl
similarity index 100%
rename from tests/data/skip-iter.ccl
rename to src/tests/data/skip-iter.ccl
diff --git a/tests/data/string.ccl b/src/tests/data/string.ccl
similarity index 100%
rename from tests/data/string.ccl
rename to src/tests/data/string.ccl
diff --git a/tests/data/t01.xml b/src/tests/data/t01.xml
similarity index 100%
rename from tests/data/t01.xml
rename to src/tests/data/t01.xml
diff --git a/tests/data/to.xml b/src/tests/data/to.xml
similarity index 100%
rename from tests/data/to.xml
rename to src/tests/data/to.xml
diff --git a/tests/data/vars.ccl b/src/tests/data/vars.ccl
similarity index 100%
rename from tests/data/vars.ccl
rename to src/tests/data/vars.ccl
diff --git a/tests/datadriven.cpp b/src/tests/datadriven.cpp
similarity index 100%
rename from tests/datadriven.cpp
rename to src/tests/datadriven.cpp
diff --git a/tests/datadriven.h b/src/tests/datadriven.h
similarity index 100%
rename from tests/datadriven.h
rename to src/tests/datadriven.h
diff --git a/tests/datarule.cpp b/src/tests/datarule.cpp
similarity index 100%
rename from tests/datarule.cpp
rename to src/tests/datarule.cpp
diff --git a/tests/datarule.h b/src/tests/datarule.h
similarity index 100%
rename from tests/datarule.h
rename to src/tests/datarule.h
diff --git a/tests/getlemmas.cpp b/src/tests/getlemmas.cpp
similarity index 100%
rename from tests/getlemmas.cpp
rename to src/tests/getlemmas.cpp
diff --git a/tests/getorth.cpp b/src/tests/getorth.cpp
similarity index 100%
rename from tests/getorth.cpp
rename to src/tests/getorth.cpp
diff --git a/tests/getsymbols.cpp b/src/tests/getsymbols.cpp
similarity index 100%
rename from tests/getsymbols.cpp
rename to src/tests/getsymbols.cpp
diff --git a/tests/getsymbolsinrange.cpp b/src/tests/getsymbolsinrange.cpp
similarity index 100%
rename from tests/getsymbolsinrange.cpp
rename to src/tests/getsymbolsinrange.cpp
diff --git a/tests/isempty.cpp b/src/tests/isempty.cpp
similarity index 100%
rename from tests/isempty.cpp
rename to src/tests/isempty.cpp
diff --git a/tests/logicalpredicates.cpp b/src/tests/logicalpredicates.cpp
similarity index 100%
rename from tests/logicalpredicates.cpp
rename to src/tests/logicalpredicates.cpp
diff --git a/tests/main.cpp b/src/tests/main.cpp
similarity index 100%
rename from tests/main.cpp
rename to src/tests/main.cpp
diff --git a/tests/mark.cpp b/src/tests/mark.cpp
similarity index 100%
rename from tests/mark.cpp
rename to src/tests/mark.cpp
diff --git a/tests/match.cpp b/src/tests/match.cpp
similarity index 100%
rename from tests/match.cpp
rename to src/tests/match.cpp
diff --git a/tests/optest.cpp b/src/tests/optest.cpp
similarity index 100%
rename from tests/optest.cpp
rename to src/tests/optest.cpp
diff --git a/tests/optest.h b/src/tests/optest.h
similarity index 100%
rename from tests/optest.h
rename to src/tests/optest.h
diff --git a/tests/position.cpp b/src/tests/position.cpp
similarity index 100%
rename from tests/position.cpp
rename to src/tests/position.cpp
diff --git a/tests/positionpredicates.cpp b/src/tests/positionpredicates.cpp
similarity index 100%
rename from tests/positionpredicates.cpp
rename to src/tests/positionpredicates.cpp
diff --git a/tests/prep-qub.lex b/src/tests/prep-qub.lex
similarity index 100%
rename from tests/prep-qub.lex
rename to src/tests/prep-qub.lex
diff --git a/tests/regex.cpp b/src/tests/regex.cpp
similarity index 100%
rename from tests/regex.cpp
rename to src/tests/regex.cpp
diff --git a/tests/relativeposition.cpp b/src/tests/relativeposition.cpp
similarity index 100%
rename from tests/relativeposition.cpp
rename to src/tests/relativeposition.cpp
diff --git a/tests/rules-data/README b/src/tests/rules-data/README
similarity index 100%
rename from tests/rules-data/README
rename to src/tests/rules-data/README
diff --git a/tests/rules-data/kipi.is-the-tagset b/src/tests/rules-data/kipi.is-the-tagset
similarity index 100%
rename from tests/rules-data/kipi.is-the-tagset
rename to src/tests/rules-data/kipi.is-the-tagset
diff --git a/tests/rules-data/match/head/cclmatch.xml b/src/tests/rules-data/match/head/cclmatch.xml
similarity index 100%
rename from tests/rules-data/match/head/cclmatch.xml
rename to src/tests/rules-data/match/head/cclmatch.xml
diff --git a/tests/rules-data/match/head/cclmatch1.ccl b/src/tests/rules-data/match/head/cclmatch1.ccl
similarity index 100%
rename from tests/rules-data/match/head/cclmatch1.ccl
rename to src/tests/rules-data/match/head/cclmatch1.ccl
diff --git a/tests/rules-data/match/head/cclmatch1.out.xml b/src/tests/rules-data/match/head/cclmatch1.out.xml
similarity index 100%
rename from tests/rules-data/match/head/cclmatch1.out.xml
rename to src/tests/rules-data/match/head/cclmatch1.out.xml
diff --git a/tests/rules-data/match/head/simple.is-the-tagset b/src/tests/rules-data/match/head/simple.is-the-tagset
similarity index 100%
rename from tests/rules-data/match/head/simple.is-the-tagset
rename to src/tests/rules-data/match/head/simple.is-the-tagset
diff --git a/tests/rules-data/match/is/cclmatch-1.xml b/src/tests/rules-data/match/is/cclmatch-1.xml
similarity index 100%
rename from tests/rules-data/match/is/cclmatch-1.xml
rename to src/tests/rules-data/match/is/cclmatch-1.xml
diff --git a/tests/rules-data/match/is/cclmatch-is1.ccl b/src/tests/rules-data/match/is/cclmatch-is1.ccl
similarity index 100%
rename from tests/rules-data/match/is/cclmatch-is1.ccl
rename to src/tests/rules-data/match/is/cclmatch-is1.ccl
diff --git a/tests/rules-data/match/is/cclmatch-is1.out.xml b/src/tests/rules-data/match/is/cclmatch-is1.out.xml
similarity index 100%
rename from tests/rules-data/match/is/cclmatch-is1.out.xml
rename to src/tests/rules-data/match/is/cclmatch-is1.out.xml
diff --git a/tests/rules-data/match/lexicon/cclmatch-1.ccl b/src/tests/rules-data/match/lexicon/cclmatch-1.ccl
similarity index 100%
rename from tests/rules-data/match/lexicon/cclmatch-1.ccl
rename to src/tests/rules-data/match/lexicon/cclmatch-1.ccl
diff --git a/tests/rules-data/match/lexicon/cclmatch-1.out.xml b/src/tests/rules-data/match/lexicon/cclmatch-1.out.xml
similarity index 100%
rename from tests/rules-data/match/lexicon/cclmatch-1.out.xml
rename to src/tests/rules-data/match/lexicon/cclmatch-1.out.xml
diff --git a/tests/rules-data/match/lexicon/cclmatch.xml b/src/tests/rules-data/match/lexicon/cclmatch.xml
similarity index 100%
rename from tests/rules-data/match/lexicon/cclmatch.xml
rename to src/tests/rules-data/match/lexicon/cclmatch.xml
diff --git a/tests/rules-data/match/lexicon/simple.is-the-tagset b/src/tests/rules-data/match/lexicon/simple.is-the-tagset
similarity index 100%
rename from tests/rules-data/match/lexicon/simple.is-the-tagset
rename to src/tests/rules-data/match/lexicon/simple.is-the-tagset
diff --git a/tests/rules-data/match/michal/cclmatch.xml b/src/tests/rules-data/match/michal/cclmatch.xml
similarity index 100%
rename from tests/rules-data/match/michal/cclmatch.xml
rename to src/tests/rules-data/match/michal/cclmatch.xml
diff --git a/tests/rules-data/match/michal/cclmatch1.ccl b/src/tests/rules-data/match/michal/cclmatch1.ccl
similarity index 100%
rename from tests/rules-data/match/michal/cclmatch1.ccl
rename to src/tests/rules-data/match/michal/cclmatch1.ccl
diff --git a/tests/rules-data/match/michal/cclmatch1.out.xml b/src/tests/rules-data/match/michal/cclmatch1.out.xml
similarity index 100%
rename from tests/rules-data/match/michal/cclmatch1.out.xml
rename to src/tests/rules-data/match/michal/cclmatch1.out.xml
diff --git a/tests/rules-data/match/michal/cclmatch2.ccl b/src/tests/rules-data/match/michal/cclmatch2.ccl
similarity index 100%
rename from tests/rules-data/match/michal/cclmatch2.ccl
rename to src/tests/rules-data/match/michal/cclmatch2.ccl
diff --git a/tests/rules-data/match/michal/cclmatch2.out.xml b/src/tests/rules-data/match/michal/cclmatch2.out.xml
similarity index 100%
rename from tests/rules-data/match/michal/cclmatch2.out.xml
rename to src/tests/rules-data/match/michal/cclmatch2.out.xml
diff --git a/tests/rules-data/match/michal/cclmatch3.ccl b/src/tests/rules-data/match/michal/cclmatch3.ccl
similarity index 100%
rename from tests/rules-data/match/michal/cclmatch3.ccl
rename to src/tests/rules-data/match/michal/cclmatch3.ccl
diff --git a/tests/rules-data/match/michal/cclmatch3.out.xml b/src/tests/rules-data/match/michal/cclmatch3.out.xml
similarity index 100%
rename from tests/rules-data/match/michal/cclmatch3.out.xml
rename to src/tests/rules-data/match/michal/cclmatch3.out.xml
diff --git a/tests/rules-data/match/postcond/cclmatch.xml b/src/tests/rules-data/match/postcond/cclmatch.xml
similarity index 100%
rename from tests/rules-data/match/postcond/cclmatch.xml
rename to src/tests/rules-data/match/postcond/cclmatch.xml
diff --git a/tests/rules-data/match/postcond/cclmatch1.ccl b/src/tests/rules-data/match/postcond/cclmatch1.ccl
similarity index 100%
rename from tests/rules-data/match/postcond/cclmatch1.ccl
rename to src/tests/rules-data/match/postcond/cclmatch1.ccl
diff --git a/tests/rules-data/match/postcond/cclmatch1.out.xml b/src/tests/rules-data/match/postcond/cclmatch1.out.xml
similarity index 100%
rename from tests/rules-data/match/postcond/cclmatch1.out.xml
rename to src/tests/rules-data/match/postcond/cclmatch1.out.xml
diff --git a/tests/rules-data/match/postcond/cclmatch2.ccl b/src/tests/rules-data/match/postcond/cclmatch2.ccl
similarity index 100%
rename from tests/rules-data/match/postcond/cclmatch2.ccl
rename to src/tests/rules-data/match/postcond/cclmatch2.ccl
diff --git a/tests/rules-data/match/postcond/cclmatch2.out.xml b/src/tests/rules-data/match/postcond/cclmatch2.out.xml
similarity index 100%
rename from tests/rules-data/match/postcond/cclmatch2.out.xml
rename to src/tests/rules-data/match/postcond/cclmatch2.out.xml
diff --git a/tests/rules-data/match/postcond2/cclmatch-none.ccl b/src/tests/rules-data/match/postcond2/cclmatch-none.ccl
similarity index 100%
rename from tests/rules-data/match/postcond2/cclmatch-none.ccl
rename to src/tests/rules-data/match/postcond2/cclmatch-none.ccl
diff --git a/tests/rules-data/match/postcond2/cclmatch-none.out.xml b/src/tests/rules-data/match/postcond2/cclmatch-none.out.xml
similarity index 100%
rename from tests/rules-data/match/postcond2/cclmatch-none.out.xml
rename to src/tests/rules-data/match/postcond2/cclmatch-none.out.xml
diff --git a/tests/rules-data/match/postcond2/cclmatch.xml b/src/tests/rules-data/match/postcond2/cclmatch.xml
similarity index 100%
rename from tests/rules-data/match/postcond2/cclmatch.xml
rename to src/tests/rules-data/match/postcond2/cclmatch.xml
diff --git a/tests/rules-data/match/postcond2/cclmatch2.ccl b/src/tests/rules-data/match/postcond2/cclmatch2.ccl
similarity index 100%
rename from tests/rules-data/match/postcond2/cclmatch2.ccl
rename to src/tests/rules-data/match/postcond2/cclmatch2.ccl
diff --git a/tests/rules-data/match/postcond2/cclmatch2.out.xml b/src/tests/rules-data/match/postcond2/cclmatch2.out.xml
similarity index 100%
rename from tests/rules-data/match/postcond2/cclmatch2.out.xml
rename to src/tests/rules-data/match/postcond2/cclmatch2.out.xml
diff --git a/tests/rules-data/match/postcond2/cclmatch3.ccl b/src/tests/rules-data/match/postcond2/cclmatch3.ccl
similarity index 100%
rename from tests/rules-data/match/postcond2/cclmatch3.ccl
rename to src/tests/rules-data/match/postcond2/cclmatch3.ccl
diff --git a/tests/rules-data/match/postcond2/cclmatch3.out.xml b/src/tests/rules-data/match/postcond2/cclmatch3.out.xml
similarity index 100%
rename from tests/rules-data/match/postcond2/cclmatch3.out.xml
rename to src/tests/rules-data/match/postcond2/cclmatch3.out.xml
diff --git a/tests/rules-data/match/postcond2/cclmatch4.ccl b/src/tests/rules-data/match/postcond2/cclmatch4.ccl
similarity index 100%
rename from tests/rules-data/match/postcond2/cclmatch4.ccl
rename to src/tests/rules-data/match/postcond2/cclmatch4.ccl
diff --git a/tests/rules-data/match/postcond2/cclmatch4.out.xml b/src/tests/rules-data/match/postcond2/cclmatch4.out.xml
similarity index 100%
rename from tests/rules-data/match/postcond2/cclmatch4.out.xml
rename to src/tests/rules-data/match/postcond2/cclmatch4.out.xml
diff --git a/tests/rules-data/match/postcond2/cclmatch5.ccl b/src/tests/rules-data/match/postcond2/cclmatch5.ccl
similarity index 100%
rename from tests/rules-data/match/postcond2/cclmatch5.ccl
rename to src/tests/rules-data/match/postcond2/cclmatch5.ccl
diff --git a/tests/rules-data/match/postcond2/cclmatch5.out.xml b/src/tests/rules-data/match/postcond2/cclmatch5.out.xml
similarity index 100%
rename from tests/rules-data/match/postcond2/cclmatch5.out.xml
rename to src/tests/rules-data/match/postcond2/cclmatch5.out.xml
diff --git a/tests/rules-data/match/postcond2/simple.is-the-tagset b/src/tests/rules-data/match/postcond2/simple.is-the-tagset
similarity index 100%
rename from tests/rules-data/match/postcond2/simple.is-the-tagset
rename to src/tests/rules-data/match/postcond2/simple.is-the-tagset
diff --git a/tests/rules-data/match/postcond3/cclmatch.xml b/src/tests/rules-data/match/postcond3/cclmatch.xml
similarity index 100%
rename from tests/rules-data/match/postcond3/cclmatch.xml
rename to src/tests/rules-data/match/postcond3/cclmatch.xml
diff --git a/tests/rules-data/match/postcond3/cclmatch1.ccl b/src/tests/rules-data/match/postcond3/cclmatch1.ccl
similarity index 100%
rename from tests/rules-data/match/postcond3/cclmatch1.ccl
rename to src/tests/rules-data/match/postcond3/cclmatch1.ccl
diff --git a/tests/rules-data/match/postcond3/cclmatch1.out.xml b/src/tests/rules-data/match/postcond3/cclmatch1.out.xml
similarity index 100%
rename from tests/rules-data/match/postcond3/cclmatch1.out.xml
rename to src/tests/rules-data/match/postcond3/cclmatch1.out.xml
diff --git a/tests/rules-data/match/postcond3/cclmatch2.ccl b/src/tests/rules-data/match/postcond3/cclmatch2.ccl
similarity index 100%
rename from tests/rules-data/match/postcond3/cclmatch2.ccl
rename to src/tests/rules-data/match/postcond3/cclmatch2.ccl
diff --git a/tests/rules-data/match/postcond3/cclmatch2.out.xml b/src/tests/rules-data/match/postcond3/cclmatch2.out.xml
similarity index 100%
rename from tests/rules-data/match/postcond3/cclmatch2.out.xml
rename to src/tests/rules-data/match/postcond3/cclmatch2.out.xml
diff --git a/tests/rules-data/match/remark/cclmatch.xml b/src/tests/rules-data/match/remark/cclmatch.xml
similarity index 100%
rename from tests/rules-data/match/remark/cclmatch.xml
rename to src/tests/rules-data/match/remark/cclmatch.xml
diff --git a/tests/rules-data/match/remark/cclmatch1.ccl b/src/tests/rules-data/match/remark/cclmatch1.ccl
similarity index 100%
rename from tests/rules-data/match/remark/cclmatch1.ccl
rename to src/tests/rules-data/match/remark/cclmatch1.ccl
diff --git a/tests/rules-data/match/remark/cclmatch1.out.xml b/src/tests/rules-data/match/remark/cclmatch1.out.xml
similarity index 100%
rename from tests/rules-data/match/remark/cclmatch1.out.xml
rename to src/tests/rules-data/match/remark/cclmatch1.out.xml
diff --git a/tests/rules-data/match/remark/simple.is-the-tagset b/src/tests/rules-data/match/remark/simple.is-the-tagset
similarity index 100%
rename from tests/rules-data/match/remark/simple.is-the-tagset
rename to src/tests/rules-data/match/remark/simple.is-the-tagset
diff --git a/tests/rules-data/match/repeat/cclmatch.xml b/src/tests/rules-data/match/repeat/cclmatch.xml
similarity index 100%
rename from tests/rules-data/match/repeat/cclmatch.xml
rename to src/tests/rules-data/match/repeat/cclmatch.xml
diff --git a/tests/rules-data/match/repeat/cclmatch3.ccl b/src/tests/rules-data/match/repeat/cclmatch3.ccl
similarity index 100%
rename from tests/rules-data/match/repeat/cclmatch3.ccl
rename to src/tests/rules-data/match/repeat/cclmatch3.ccl
diff --git a/tests/rules-data/match/repeat/cclmatch3.out.xml b/src/tests/rules-data/match/repeat/cclmatch3.out.xml
similarity index 100%
rename from tests/rules-data/match/repeat/cclmatch3.out.xml
rename to src/tests/rules-data/match/repeat/cclmatch3.out.xml
diff --git a/tests/rules-data/match/repeat/cclmatch4.ccl b/src/tests/rules-data/match/repeat/cclmatch4.ccl
similarity index 100%
rename from tests/rules-data/match/repeat/cclmatch4.ccl
rename to src/tests/rules-data/match/repeat/cclmatch4.ccl
diff --git a/tests/rules-data/match/repeat/cclmatch4.out.xml b/src/tests/rules-data/match/repeat/cclmatch4.out.xml
similarity index 100%
rename from tests/rules-data/match/repeat/cclmatch4.out.xml
rename to src/tests/rules-data/match/repeat/cclmatch4.out.xml
diff --git a/tests/rules-data/match/single_tok/cclmatch.xml b/src/tests/rules-data/match/single_tok/cclmatch.xml
similarity index 100%
rename from tests/rules-data/match/single_tok/cclmatch.xml
rename to src/tests/rules-data/match/single_tok/cclmatch.xml
diff --git a/tests/rules-data/match/single_tok/cclmatch1.ccl b/src/tests/rules-data/match/single_tok/cclmatch1.ccl
similarity index 100%
rename from tests/rules-data/match/single_tok/cclmatch1.ccl
rename to src/tests/rules-data/match/single_tok/cclmatch1.ccl
diff --git a/tests/rules-data/match/single_tok/cclmatch1.out.xml b/src/tests/rules-data/match/single_tok/cclmatch1.out.xml
similarity index 100%
rename from tests/rules-data/match/single_tok/cclmatch1.out.xml
rename to src/tests/rules-data/match/single_tok/cclmatch1.out.xml
diff --git a/tests/rules-data/match/text/cclmatch.xml b/src/tests/rules-data/match/text/cclmatch.xml
similarity index 100%
rename from tests/rules-data/match/text/cclmatch.xml
rename to src/tests/rules-data/match/text/cclmatch.xml
diff --git a/tests/rules-data/match/text/cclmatch1.ccl b/src/tests/rules-data/match/text/cclmatch1.ccl
similarity index 100%
rename from tests/rules-data/match/text/cclmatch1.ccl
rename to src/tests/rules-data/match/text/cclmatch1.ccl
diff --git a/tests/rules-data/match/text/cclmatch1.out.xml b/src/tests/rules-data/match/text/cclmatch1.out.xml
similarity index 100%
rename from tests/rules-data/match/text/cclmatch1.out.xml
rename to src/tests/rules-data/match/text/cclmatch1.out.xml
diff --git a/tests/rules-data/match/text/cclmatch2.ccl b/src/tests/rules-data/match/text/cclmatch2.ccl
similarity index 100%
rename from tests/rules-data/match/text/cclmatch2.ccl
rename to src/tests/rules-data/match/text/cclmatch2.ccl
diff --git a/tests/rules-data/match/text/cclmatch2.out.xml b/src/tests/rules-data/match/text/cclmatch2.out.xml
similarity index 100%
rename from tests/rules-data/match/text/cclmatch2.out.xml
rename to src/tests/rules-data/match/text/cclmatch2.out.xml
diff --git a/tests/rules-data/match/unmark/cclmatch.xml b/src/tests/rules-data/match/unmark/cclmatch.xml
similarity index 100%
rename from tests/rules-data/match/unmark/cclmatch.xml
rename to src/tests/rules-data/match/unmark/cclmatch.xml
diff --git a/tests/rules-data/match/unmark/cclmatch1.ccl b/src/tests/rules-data/match/unmark/cclmatch1.ccl
similarity index 100%
rename from tests/rules-data/match/unmark/cclmatch1.ccl
rename to src/tests/rules-data/match/unmark/cclmatch1.ccl
diff --git a/tests/rules-data/match/unmark/cclmatch1.out.xml b/src/tests/rules-data/match/unmark/cclmatch1.out.xml
similarity index 100%
rename from tests/rules-data/match/unmark/cclmatch1.out.xml
rename to src/tests/rules-data/match/unmark/cclmatch1.out.xml
diff --git a/tests/rules-data/match/unmark/cclmatch2.ccl b/src/tests/rules-data/match/unmark/cclmatch2.ccl
similarity index 100%
rename from tests/rules-data/match/unmark/cclmatch2.ccl
rename to src/tests/rules-data/match/unmark/cclmatch2.ccl
diff --git a/tests/rules-data/match/unmark/cclmatch2.out.xml b/src/tests/rules-data/match/unmark/cclmatch2.out.xml
similarity index 100%
rename from tests/rules-data/match/unmark/cclmatch2.out.xml
rename to src/tests/rules-data/match/unmark/cclmatch2.out.xml
diff --git a/tests/rules-data/match/unmark/simple.is-the-tagset b/src/tests/rules-data/match/unmark/simple.is-the-tagset
similarity index 100%
rename from tests/rules-data/match/unmark/simple.is-the-tagset
rename to src/tests/rules-data/match/unmark/simple.is-the-tagset
diff --git a/tests/rules-data/match/variants/cclmatch.xml b/src/tests/rules-data/match/variants/cclmatch.xml
similarity index 100%
rename from tests/rules-data/match/variants/cclmatch.xml
rename to src/tests/rules-data/match/variants/cclmatch.xml
diff --git a/tests/rules-data/match/variants/cclmatch1.ccl b/src/tests/rules-data/match/variants/cclmatch1.ccl
similarity index 100%
rename from tests/rules-data/match/variants/cclmatch1.ccl
rename to src/tests/rules-data/match/variants/cclmatch1.ccl
diff --git a/tests/rules-data/match/variants/cclmatch1.out.xml b/src/tests/rules-data/match/variants/cclmatch1.out.xml
similarity index 100%
rename from tests/rules-data/match/variants/cclmatch1.out.xml
rename to src/tests/rules-data/match/variants/cclmatch1.out.xml
diff --git a/tests/rules-data/match/variants/cclmatch2.ccl b/src/tests/rules-data/match/variants/cclmatch2.ccl
similarity index 100%
rename from tests/rules-data/match/variants/cclmatch2.ccl
rename to src/tests/rules-data/match/variants/cclmatch2.ccl
diff --git a/tests/rules-data/match/variants/cclmatch2.out.xml b/src/tests/rules-data/match/variants/cclmatch2.out.xml
similarity index 100%
rename from tests/rules-data/match/variants/cclmatch2.out.xml
rename to src/tests/rules-data/match/variants/cclmatch2.out.xml
diff --git a/tests/rules-data/match/variants/simple.is-the-tagset b/src/tests/rules-data/match/variants/simple.is-the-tagset
similarity index 100%
rename from tests/rules-data/match/variants/simple.is-the-tagset
rename to src/tests/rules-data/match/variants/simple.is-the-tagset
diff --git a/tests/rules-data/tag/manyrules/agr.xml b/src/tests/rules-data/tag/manyrules/agr.xml
similarity index 100%
rename from tests/rules-data/tag/manyrules/agr.xml
rename to src/tests/rules-data/tag/manyrules/agr.xml
diff --git a/tests/rules-data/tag/manyrules/prep-agr.ccl b/src/tests/rules-data/tag/manyrules/prep-agr.ccl
similarity index 100%
rename from tests/rules-data/tag/manyrules/prep-agr.ccl
rename to src/tests/rules-data/tag/manyrules/prep-agr.ccl
diff --git a/tests/rules-data/tag/manyrules/prep-agr.out.xml b/src/tests/rules-data/tag/manyrules/prep-agr.out.xml
similarity index 100%
rename from tests/rules-data/tag/manyrules/prep-agr.out.xml
rename to src/tests/rules-data/tag/manyrules/prep-agr.out.xml
diff --git a/tests/rules-data/tag/relabel-enc/enc.ccl b/src/tests/rules-data/tag/relabel-enc/enc.ccl
similarity index 100%
rename from tests/rules-data/tag/relabel-enc/enc.ccl
rename to src/tests/rules-data/tag/relabel-enc/enc.ccl
diff --git a/tests/rules-data/tag/relabel-enc/enc.out.xml b/src/tests/rules-data/tag/relabel-enc/enc.out.xml
similarity index 100%
rename from tests/rules-data/tag/relabel-enc/enc.out.xml
rename to src/tests/rules-data/tag/relabel-enc/enc.out.xml
diff --git a/tests/rules-data/tag/relabel-enc/suger.xml b/src/tests/rules-data/tag/relabel-enc/suger.xml
similarity index 100%
rename from tests/rules-data/tag/relabel-enc/suger.xml
rename to src/tests/rules-data/tag/relabel-enc/suger.xml
diff --git a/tests/rules-data/tag/select/psykoty.xml b/src/tests/rules-data/tag/select/psykoty.xml
similarity index 100%
rename from tests/rules-data/tag/select/psykoty.xml
rename to src/tests/rules-data/tag/select/psykoty.xml
diff --git a/tests/rules-data/tag/select/sel_agr.ccl b/src/tests/rules-data/tag/select/sel_agr.ccl
similarity index 100%
rename from tests/rules-data/tag/select/sel_agr.ccl
rename to src/tests/rules-data/tag/select/sel_agr.ccl
diff --git a/tests/rules-data/tag/select/sel_agr.out.xml b/src/tests/rules-data/tag/select/sel_agr.out.xml
similarity index 100%
rename from tests/rules-data/tag/select/sel_agr.out.xml
rename to src/tests/rules-data/tag/select/sel_agr.out.xml
diff --git a/tests/rules-data/tag/select/seln.ccl b/src/tests/rules-data/tag/select/seln.ccl
similarity index 100%
rename from tests/rules-data/tag/select/seln.ccl
rename to src/tests/rules-data/tag/select/seln.ccl
diff --git a/tests/rules-data/tag/select/seln.out.xml b/src/tests/rules-data/tag/select/seln.out.xml
similarity index 100%
rename from tests/rules-data/tag/select/seln.out.xml
rename to src/tests/rules-data/tag/select/seln.out.xml
diff --git a/tests/rules-data/tag/select/seln1.ccl b/src/tests/rules-data/tag/select/seln1.ccl
similarity index 100%
rename from tests/rules-data/tag/select/seln1.ccl
rename to src/tests/rules-data/tag/select/seln1.ccl
diff --git a/tests/rules-data/tag/select/seln1.out.xml b/src/tests/rules-data/tag/select/seln1.out.xml
similarity index 100%
rename from tests/rules-data/tag/select/seln1.out.xml
rename to src/tests/rules-data/tag/select/seln1.out.xml
diff --git a/tests/rules-data/tag/unify/agreed.ccl b/src/tests/rules-data/tag/unify/agreed.ccl
similarity index 100%
rename from tests/rules-data/tag/unify/agreed.ccl
rename to src/tests/rules-data/tag/unify/agreed.ccl
diff --git a/tests/rules-data/tag/unify/agreed.out.xml b/src/tests/rules-data/tag/unify/agreed.out.xml
similarity index 100%
rename from tests/rules-data/tag/unify/agreed.out.xml
rename to src/tests/rules-data/tag/unify/agreed.out.xml
diff --git a/tests/rules-data/tag/unify/kobieta.xml b/src/tests/rules-data/tag/unify/kobieta.xml
similarity index 100%
rename from tests/rules-data/tag/unify/kobieta.xml
rename to src/tests/rules-data/tag/unify/kobieta.xml
diff --git a/tests/rules-data/tag/unify2/agr.ccl b/src/tests/rules-data/tag/unify2/agr.ccl
similarity index 100%
rename from tests/rules-data/tag/unify2/agr.ccl
rename to src/tests/rules-data/tag/unify2/agr.ccl
diff --git a/tests/rules-data/tag/unify2/agr.out.xml b/src/tests/rules-data/tag/unify2/agr.out.xml
similarity index 100%
rename from tests/rules-data/tag/unify2/agr.out.xml
rename to src/tests/rules-data/tag/unify2/agr.out.xml
diff --git a/tests/rules-data/tag/unify2/in.xml b/src/tests/rules-data/tag/unify2/in.xml
similarity index 100%
rename from tests/rules-data/tag/unify2/in.xml
rename to src/tests/rules-data/tag/unify2/in.xml
diff --git a/tests/rules-data/tag/zero/rule.ccl b/src/tests/rules-data/tag/zero/rule.ccl
similarity index 100%
rename from tests/rules-data/tag/zero/rule.ccl
rename to src/tests/rules-data/tag/zero/rule.ccl
diff --git a/tests/rules-data/tag/zero/rule.out.xml b/src/tests/rules-data/tag/zero/rule.out.xml
similarity index 100%
rename from tests/rules-data/tag/zero/rule.out.xml
rename to src/tests/rules-data/tag/zero/rule.out.xml
diff --git a/tests/rules-data/tag/zero/t01.xml b/src/tests/rules-data/tag/zero/t01.xml
similarity index 100%
rename from tests/rules-data/tag/zero/t01.xml
rename to src/tests/rules-data/tag/zero/t01.xml
diff --git a/tests/strsetfunctions.cpp b/src/tests/strsetfunctions.cpp
similarity index 100%
rename from tests/strsetfunctions.cpp
rename to src/tests/strsetfunctions.cpp
diff --git a/tests/values.cpp b/src/tests/values.cpp
similarity index 100%
rename from tests/values.cpp
rename to src/tests/values.cpp
diff --git a/tests/varaccess.cpp b/src/tests/varaccess.cpp
similarity index 100%
rename from tests/varaccess.cpp
rename to src/tests/varaccess.cpp
diff --git a/tests/vargetter.cpp b/src/tests/vargetter.cpp
similarity index 100%
rename from tests/vargetter.cpp
rename to src/tests/vargetter.cpp
diff --git a/tests/variables.cpp b/src/tests/variables.cpp
similarity index 100%
rename from tests/variables.cpp
rename to src/tests/variables.cpp
diff --git a/tests/varsetter.cpp b/src/tests/varsetter.cpp
similarity index 100%
rename from tests/varsetter.cpp
rename to src/tests/varsetter.cpp
diff --git a/tools/button.sh b/src/tools/button.sh
similarity index 100%
rename from tools/button.sh
rename to src/tools/button.sh
diff --git a/tools/ruljos2wccl.py b/src/tools/ruljos2wccl.py
similarity index 100%
rename from tools/ruljos2wccl.py
rename to src/tools/ruljos2wccl.py
diff --git a/wccl-apps/CMakeLists.txt b/src/wccl-apps/CMakeLists.txt
similarity index 100%
rename from wccl-apps/CMakeLists.txt
rename to src/wccl-apps/CMakeLists.txt
diff --git a/wccl-apps/stdopts.cpp b/src/wccl-apps/stdopts.cpp
similarity index 100%
rename from wccl-apps/stdopts.cpp
rename to src/wccl-apps/stdopts.cpp
diff --git a/wccl-apps/stdopts.h b/src/wccl-apps/stdopts.h
similarity index 100%
rename from wccl-apps/stdopts.h
rename to src/wccl-apps/stdopts.h
diff --git a/wccl-apps/wccl-features.cpp b/src/wccl-apps/wccl-features.cpp
similarity index 100%
rename from wccl-apps/wccl-features.cpp
rename to src/wccl-apps/wccl-features.cpp
diff --git a/wccl-apps/wccl-parser.cpp b/src/wccl-apps/wccl-parser.cpp
similarity index 100%
rename from wccl-apps/wccl-parser.cpp
rename to src/wccl-apps/wccl-parser.cpp
diff --git a/wccl-apps/wccl-rules.cpp b/src/wccl-apps/wccl-rules.cpp
similarity index 100%
rename from wccl-apps/wccl-rules.cpp
rename to src/wccl-apps/wccl-rules.cpp
diff --git a/wccl-apps/wccl-run.cpp b/src/wccl-apps/wccl-run.cpp
similarity index 100%
rename from wccl-apps/wccl-run.cpp
rename to src/wccl-apps/wccl-run.cpp
diff --git a/swig/Makefile b/swig/Makefile
deleted file mode 100644
index 7a89f0495df24bed6d056625f6d5af645926b1ab..0000000000000000000000000000000000000000
--- a/swig/Makefile
+++ /dev/null
@@ -1,432 +0,0 @@
-CPP=g++
-SWIG=swig
-SWIGOPTS_LANG=-c++ -python 
-
-PYTHONDIR=/usr/include/python2.6
-WCCLDIR=/usr/local/include/libwccl/
-CORPUS2DIR=/usr/local/include/libcorpus2/
-PWRUTILDIR=
-
-CORPUS2BIN=/usr/local/lib/libcorpus2.so
-PWRUTILBIN=/usr/local/lib/libpwrutils.so
-CCLBIN=/usr/local/lib/libwccl.so
-ANTLRLIB=/usr/lib/libantlr-pic.a 
-
-# CPPFLAGS=-fPIC -Wall -O2
-CPPFLAGS=-fPIC -O2
-
-CBIN=libcclvalue.o \
-	libcclbool.o \
-	libcclposition.o \
-	libccltset.o \
-	libcclstrset.o \
-	libcclmatch.o \
-	libcclmatchdata.o \
-	libccltokenmatch.o \
-	libcclannotationmatch.o \
-	libcclmatchvector.o \
-	libcclexpression.o \
-	libcclparsedexpression.o \
-	libcclfunctionaloperator.o \
-	libccloperator.o \
-	libcclvariables.o \
-	libcclsentencecontext.o \
-	libcclparser.o \
-	libcclactionexeccontext.o \
-	libccltagaction.o \
-	libccltagrule.o \
-	libccltagrulesequence.o \
-	libcclmatchrule.o \
-	libcclmatchrulesequence.o \
-	libcclfunctionalopsequence.o \
-	libccllexicon.o \
-	libccllexicons.o \
-	libcclwcclfileopsections.o \
-	libcclwcclfile.o \
-	wccl.o
-
-CBINOUT=_libcclvalue.so \
-				_libcclstrset.so \
-				_libcclbool.so \
-				_libcclposition.so \
-				_libccltset.so \
-				_libcclexpression.so \
-				_libcclparsedexpression.so \
-				_libcclfunctionaloperator.so \
-				_libcclvariables.so \
-				_libcclmatch.so \
-				_libcclmatchdata.so \
-				_libccltokenmatch.so \
-				_libcclannotationmatch.so \
-				_libcclmatchvector.so \
-				_libcclsentencecontext.so \
-				_libccloperator.so \
-				_libcclparser.so \
-				_libcclactionexeccontext.so \
-				_libccltagaction.so \
-				_libccltagrule.so \
-				_libccltagrulesequence.so \
-				_libcclmatchrule.so \
-				_libcclmatchrulesequence.so \
-				_libcclfunctionalopsequence.so \
-				_libccllexicon.so \
-				_libccllexicons.so \
-				_libcclwcclfileopsections.so \
-				_libcclwcclfile.so \
-				_wccl.so \
-				_boost_shared_ptr.so
-
-CWRAP=libcclvalue_wrap.cxx \
-			libcclstrset_wrap.cxx \
-			libcclbool_wrap.cxx \
-			libcclposition_wrap.cxx \
-			libccltset_wrap.cxx \
-			libcclexpression_wrap.cxx \
-			libcclparsedexpression_wrap.cxx \
-			libcclfunctionaloperator_wrap.cxx \
-			libcclvariables_wrap.cxx \
-			libcclmatch_wrap.cxx \
-			libcclmatchdata_wrap.cxx \
-			libccltokenmatch_wrap.cxx \
-			libcclannotationmatch_wrap.cxx \
-			libcclmatchvector_wrap.cxx \
-			libcclsentencecontext_wrap.cxx \
-			libccloperator_wrap.cxx \
-			libcclparser_wrap.cxx \
-			libcclactionexeccontext_wrap.cxx \
-			libccltagaction_wrap.cxx \
-			libccltagrule_wrap.cxx \
-			libccltagrulesequence_wrap.cxx \
-			libcclmatchrule_wrap.cxx \
-			libcclmatchrulesequence_wrap.cxx \
-			libcclfunctionalopsequence_wrap.cxx \
-			libccllexicon_wrap.cxx \
-			libccllexicons_wrap.cxx \
-			libcclwcclfileopsections_wrap.cxx \
-			libcclwcclfile_wrap.cxx \
-			wccl_wrap.cxx \
-			boost_shared_ptr_wrap.cxx
-
-CWRAPBIN=libcclvalue_wrap.o \
-				 libcclstrset_wrap.o \
-				 libcclbool_wrap.o \
-				 libcclposition_wrap.o \
-				 libccltset_wrap.o \
-				 libcclexpression_wrap.o \
-				 libcclparsedexpression_wrap.o \
-				 libcclfunctionaloperator_wrap.o \
-				 libcclvariables_wrap.o \
-				 libcclmatch_wrap.o \
-				 libcclmatchdata_wrap.o \
-				 libccltokenmatch_wrap.o \
-				 libcclannotationmatch_wrap.o \
-				 libcclmatchvector_wrap.o \
-				 libcclsentencecontext_wrap.o \
-				 libccloperator_wrap.o \
-				 libcclparser_wrap.o \
-				 libcclactionexeccontext_wrap.o \
-				 libccltagaction_wrap.o \
-				 libccltagrule_wrap.o \
-				 libccltagrulesequence_wrap.o \
-				 libcclmatchrule_wrap.o \
-				 libcclmatchrulesequence_wrap.o \
-				 libcclfunctionalopsequence_wrap.o \
-				 libccllexicon_wrap.o \
-				 libccllexicons_wrap.o \
-				 libcclwcclfileopsections_wrap.o \
-				 libcclwcclfile_wrap.o \
-				 wccl_wrap.o \
-				 boost_shared_ptr_wrap.o
-
-PYMODULES=libcclvalue.py \
-					libcclstrset.py \
-					libcclbool.py \
-					libcclposition.py \
-					libccltset.py \
-					libcclmatch.py \
-					libcclmatchdata.py \
-					libccltokenmatch.py \
-					libcclexpression.py \
-					libcclparsedexpression.py \
-					libcclvariables.py \
-					libcclsentencecontext.py \
-					libcclannotationmatch.py \
-					libcclmatchvector.py \
-					libcclfunctionaloperator.py \
-					libccloperator.py \
-					libcclparser.py \
-					libcclactionexeccontext.py \
-					libccltagaction.py \
-					libccltagrule.py \
-					libccltagrulesequence.py \
-					libcclmatchrule.py \
-					libcclmatchrulesequence.py \
-					libcclfunctionalopsequence.py \
-					libccllexicon.py \
-					libccllexicons.py \
-					libcclwcclfileopsections.py \
-					libcclwcclfile.py \
-					wccl.py \
-					boost_shared_ptr.py
-
-PYCBIN=libcclvalue.pyc \
-			 libcclstrset.pyc \
-			 libcclbool.pyc \
-			 libcclposition.pyc \
-			 libccltset.pyc \
-			 libcclmatch.pyc \
-			 libcclmatchdata.pyc \
-			 libccltokenmatch.pyc \
-			 libcclexpression.pyc \
-			 libcclparsedexpression.pyc \
-			 libcclvariables.pyc \
-			 libcclsentencecontext.pyc \
-			 libcclannotationmatch.pyc \
-			 libcclmatchvector.pyc \
-			 libcclfunctionaloperator.pyc \
-			 libccloperator.pyc \
-			 libcclparser.pyc \
-			 libcclactionexeccontext.pyc \
-			 libccltagaction.pyc \
-			 libccltagrule.pyc \
-			 libccltagrulesequence.pyc \
-			 libcclmatchrule.pyc \
-			 libcclmatchrulesequence.pyc \
-			 libcclfunctionalopsequence.pyc \
-			 libccllexicon.pyc \
-			 libccllexicons.pyc \
-			 libcclwcclfileopsections.pyc \
-			 libcclwcclfile.pyc \
-			 wccl.pyc \
-			 boost_shared_ptr.pyc
-
-all:boost_shared_ptr.o $(CBIN)
-	# Nothing to do
-
-# -----------------------------------------------------------------------------
-# -----------------------------------------------------------------------------
-#  boost::shared_ptr wrappers
-# -----------------------------------------------------------------------------
-# -----------------------------------------------------------------------------
-# shared_ptr
-boost_shared_ptr.o:
-	$(SWIG) $(SWIGOPTS_LANG) boost_shared_ptr.i
-	$(CPP) -c boost_shared_ptr_wrap.cxx -I$(PYTHONDIR) $(CPPFLAGS)
-	$(CPP) -shared boost_shared_ptr_wrap.o -o _boost_shared_ptr.so
-
-# -----------------------------------------------------------------------------
-# -----------------------------------------------------------------------------
-#  CCL Wrappers
-# -----------------------------------------------------------------------------
-# -----------------------------------------------------------------------------
-# Value
-libcclvalue.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclvalue.i
-	$(CPP) -c libcclvalue_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclvalue_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclvalue.so
-
-# Bool
-libcclbool.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclbool.i
-	$(CPP) -c libcclbool_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclbool_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclbool.so
-
-# Position
-libcclposition.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclposition.i
-	$(CPP) -c libcclposition_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclposition_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclposition.so
-
-# TSet
-libccltset.o:
-	$(SWIG) $(SWIGOPTS_LANG) libccltset.i
-	$(CPP) -c libccltset_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libccltset_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libccltset.so
-
-# StrSet
-libcclstrset.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclstrset.i
-	$(CPP) -c libcclstrset_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclstrset_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclstrset.so
-
-# match
-libcclmatch.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclmatch.i
-	$(CPP) -c libcclmatch_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclmatch_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclmatch.so
-
-# MatchData
-libcclmatchdata.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclmatchdata.i
-	$(CPP) -c libcclmatchdata_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclmatchdata_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclmatchdata.so
-
-# TokenMatch
-libccltokenmatch.o:
-	$(SWIG) $(SWIGOPTS_LANG) libccltokenmatch.i
-	$(CPP) -c libccltokenmatch_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libccltokenmatch_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libccltokenmatch.so
-
-# AnnotationMatch
-libcclannotationmatch.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclannotationmatch.i
-	$(CPP) -c libcclannotationmatch_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclannotationmatch_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclannotationmatch.so
-
-# MatchVector
-libcclmatchvector.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclmatchvector.i
-	$(CPP) -c libcclmatchvector_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclmatchvector_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclmatchvector.so
-
-# Expression
-libcclexpression.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclexpression.i
-	$(CPP) -c libcclexpression_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclexpression_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclexpression.so
-
-# ParsedExpression
-libcclparsedexpression.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclparsedexpression.i
-	$(CPP) -c libcclparsedexpression_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclparsedexpression_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclparsedexpression.so
-
-# FunctionalOperator
-libcclfunctionaloperator.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclfunctionaloperator.i
-	$(CPP) -c libcclfunctionaloperator_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclfunctionaloperator_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclfunctionaloperator.so
-
-# Operator
-libccloperator.o:
-	$(SWIG) $(SWIGOPTS_LANG) libccloperator.i
-	$(CPP) -c libccloperator_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libccloperator_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libccloperator.so
-
-# Variables
-libcclvariables.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclvariables.i
-	$(CPP) -c libcclvariables_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclvariables_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclvariables.so
-
-# SentenceContext
-libcclsentencecontext.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclsentencecontext.i
-	$(CPP) -c libcclsentencecontext_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclsentencecontext_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclsentencecontext.so
-
-# -----------------------------------------------------------------------------
-
-# User Parser
-libcclparser.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclparser.i
-	$(CPP) -c libcclparser_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclparser_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclparser.so
-
-# -----------------------------------------------------------------------------
-
-# ActionExecContext
-libcclactionexeccontext.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclactionexeccontext.i
-	$(CPP) -c libcclactionexeccontext_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclactionexeccontext_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclactionexeccontext.so
-
-# TagAction
-libccltagaction.o:
-	$(SWIG) $(SWIGOPTS_LANG) libccltagaction.i
-	$(CPP) -c libccltagaction_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libccltagaction_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libccltagaction.so
-
-# TagRule
-libccltagrule.o:
-	$(SWIG) $(SWIGOPTS_LANG) libccltagrule.i
-	$(CPP) -c libccltagrule_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libccltagrule_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libccltagrule.so
-
-# TagRuleSequence
-libccltagrulesequence.o:
-	$(SWIG) $(SWIGOPTS_LANG) libccltagrulesequence.i
-	$(CPP) -c libccltagrulesequence_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libccltagrulesequence_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libccltagrulesequence.so
-
-# MatchRule
-libcclmatchrule.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclmatchrule.i
-	$(CPP) -c libcclmatchrule_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclmatchrule_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclmatchrule.so
-
-# MatchRuleSequence
-libcclmatchrulesequence.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclmatchrulesequence.i
-	$(CPP) -c libcclmatchrulesequence_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclmatchrulesequence_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclmatchrulesequence.so
-
-# FunctionalOpSequence
-libcclfunctionalopsequence.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclfunctionalopsequence.i
-	$(CPP) -c libcclfunctionalopsequence_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclfunctionalopsequence_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclfunctionalopsequence.so
-
-# Lexicon
-libccllexicon.o:
-	$(SWIG) $(SWIGOPTS_LANG) libccllexicon.i
-	$(CPP) -c libccllexicon_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libccllexicon_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libccllexicon.so
-
-# Lexicons
-libccllexicons.o:
-	$(SWIG) $(SWIGOPTS_LANG) libccllexicons.i
-	$(CPP) -c libccllexicons_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libccllexicons_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libccllexicons.so
-
-# WcclFileOpSections
-libcclwcclfileopsections.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclwcclfileopsections.i
-	$(CPP) -c libcclwcclfileopsections_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclwcclfileopsections_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclwcclfileopsections.so
-	
-# WcclFile
-libcclwcclfile.o:
-	$(SWIG) $(SWIGOPTS_LANG) libcclwcclfile.i
-	$(CPP) -c libcclwcclfile_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared libcclwcclfile_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _libcclwcclfile.so
-
-# -----------------------------------------------------------------------------
-# Wccl Library
-wccl.o:
-	$(SWIG) $(SWIGOPTS_LANG) wccl.i
-	$(CPP) -c wccl_wrap.cxx -I$(PYTHONDIR) -I$(WCCLDIR) $(CPPFLAGS)
-	$(CPP) -shared wccl_wrap.o \
-		$(CCLBIN) $(ANTLRLIB) -o _wccl.so
-
-# -----------------------------------------------------------------------------
-clean:
-	rm -f $(CBIN) $(CBINOUT) $(CWRAP) $(CWRAPBIN) $(PYMODULES) $(PYCBIN)