diff --git a/Makefile b/Makefile
index bc35f06..319f03b 100755
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,14 @@ define COMMON_PARAMS
 -f markdown+implicit_figures+backtick_code_blocks \
 --number-sections \
 --toc \
--s \
--S \
---filter pandoc-include \
+--smart \
+--standalone \
+--normalize \
 --filter pandoc-crossref \
 --filter pandoc-citeproc \
 --bibliography references.bib \
---csl style/iso690-author-date-cs.csl
+--csl style/iso690-author-date-cs.csl \
+parts/metadata.yaml
 endef
 
 html:
@@ -20,7 +21,7 @@ html:
 		--css http://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic \
 		--css media/css/bootstrap.css \
 		$(COMMON_PARAMS) \
-		text.md
+		parts/*.md
 
 pdf:
 	pandoc --latex-engine=xelatex \
@@ -35,7 +36,7 @@ pdf:
 		-V papersize=a4paper \
 		-V documentclass:report \
 		$(COMMON_PARAMS) \
-		text.md
+		staging/*.md parts/*.md
 
 excerpt:
 	pandoc --latex-engine=xelatex \
@@ -49,7 +50,7 @@ excerpt:
 		-V papersize=a4paper \
 		-V documentclass:report \
 		$(COMMON_PARAMS) \
-		excerpt.md
+		parts/*.md
 
 clean:
 	rm -f text.html text.pdf excerpt.pdf
diff --git a/excerpt.md b/excerpt.md
deleted file mode 100644
index d73bb48..0000000
--- a/excerpt.md
+++ /dev/null
@@ -1,64 +0,0 @@
----
-title: Matchmaking of bidders and public contracts using linked open data
-author: Jindřich Mynarz
-institute: Department of Information and Knowledge Engineering, University of Economics
-date: 2017
-keywords:
-- matchmaking
-- recommender systems
-- case-based reasoning
-- linked data
-- open data
-- public procurement
-link-citations: true
----
-
-\newpage
-
-```include
-parts/introduction.md
-parts/linked_open_data.md
-parts/open_data.md
-parts/linked_data.md
-parts/public_procurement_domain.md
-parts/matchmaking.md
-parts/case_based_reasoning.md
-parts/statistical_relational_learning.md
-parts/related_work.md
-parts/data_preparation.md
-parts/modelling.md
-parts/public_contracts_ontology.md
-parts/concrete_data_model.md
-parts/extraction.md
-parts/transformation.md
-parts/linking.md
-parts/geocoding.md
-parts/linked_datasets.md
-parts/cpv.md
-parts/ares.md
-parts/czech_addresses.md
-parts/zindex.md
-parts/fusion.md
-parts/loading.md
-parts/loading_sparql.md
-parts/loading_rescal.md
-parts/data_summary.md
-parts/methods.md
-parts/ground_truth.md
-parts/sparql.md
-parts/tensor_factorization.md
-parts/evaluation.md
-parts/offline_evaluation.md
-parts/results_sparql.md
-parts/results_rescal.md
-parts/results_comparison.md
-parts/conclusions.md
-parts/references.md
-```
-
-<div id="refs"></div>
-
-```include
-parts/software.md
-parts/abbreviations.md
-```
diff --git a/parts/analyses.md b/out-takes/analyses.md
similarity index 100%
rename from parts/analyses.md
rename to out-takes/analyses.md
diff --git a/out-takes/definitions.md b/out-takes/definitions.md
new file mode 100644
index 0000000..ee6961b
--- /dev/null
+++ b/out-takes/definitions.md
@@ -0,0 +1,9 @@
+## Definitions
+
+<!--
+TODO: Distribute this section to the parts that reference the notation.
+-->
+
+We can start with a definition of the key entities involved in the matchmaking task.
+Let $C$ be the set of public contracts, $B$ the set of bidders, $Auth$ the set of contracting authorities, and $Con_{CPV}$ be the set of CPV concepts.
+We use numeric subscripts to access elements of n-tuples, so that $coll_{i}$ denotes the $i$-th element of n-tuple $coll$.
diff --git a/parts/factors.md b/out-takes/factors.md
similarity index 100%
rename from parts/factors.md
rename to out-takes/factors.md
diff --git a/parts/full_text_search.md b/out-takes/full_text_search.md
similarity index 100%
rename from parts/full_text_search.md
rename to out-takes/full_text_search.md
diff --git a/parts/further_problems.md b/out-takes/further_problems.md
similarity index 100%
rename from parts/further_problems.md
rename to out-takes/further_problems.md
diff --git a/parts/loading_elasticsearch.md b/out-takes/loading_elasticsearch.md
similarity index 100%
rename from parts/loading_elasticsearch.md
rename to out-takes/loading_elasticsearch.md
diff --git a/parts/online_evaluation.md b/out-takes/online_evaluation.md
similarity index 100%
rename from parts/online_evaluation.md
rename to out-takes/online_evaluation.md
diff --git a/parts/qualitative_evaluation.md b/out-takes/qualitative_evaluation.md
similarity index 100%
rename from parts/qualitative_evaluation.md
rename to out-takes/qualitative_evaluation.md
diff --git a/parts/introduction.md b/parts/1.00_introduction.md
similarity index 100%
rename from parts/introduction.md
rename to parts/1.00_introduction.md
diff --git a/parts/linked_open_data.md b/parts/1.01_linked_open_data.md
similarity index 100%
rename from parts/linked_open_data.md
rename to parts/1.01_linked_open_data.md
diff --git a/parts/open_data.md b/parts/1.02_open_data.md
similarity index 100%
rename from parts/open_data.md
rename to parts/1.02_open_data.md
diff --git a/parts/linked_data.md b/parts/1.03_linked_data.md
similarity index 100%
rename from parts/linked_data.md
rename to parts/1.03_linked_data.md
diff --git a/parts/public_procurement_domain.md b/parts/1.04_public_procurement_domain.md
similarity index 98%
rename from parts/public_procurement_domain.md
rename to parts/1.04_public_procurement_domain.md
index 8992c90..f0e3a04 100644
--- a/parts/public_procurement_domain.md
+++ b/parts/1.04_public_procurement_domain.md
@@ -24,10 +24,10 @@ Matchmaking in public procurement can be framed in its legal and economic contex
 
 Public procurement is a domain governed by law.
 We are focused on the Czech public procurement, for which there are two primary sources of relevant law, including the national law and the EU law.
-Public procurement in the Czech Republic is governed by the law no. 2016/134 [@CzechRepublic2016].
+Public procurement in the Czech Republic is governed by the act no. 2016/134 [@CzechRepublic2016].
 Czech Republic, as a member state of the European Union, harmonises its law with EU directives, in particular the directives 2014/24/EU [@EU2014a] and 2014/25/EU [@EU2014b] in case of public procurement.
 The first directive regulates public procurement of works, supplies, or services, while the latter one regulates public procurement of utilities, including water, energy, transport, and postal services.
-The law no. 2016/134 transposes these directives into the Czech legislation.
+The act no. 2016/134 transposes these directives into the Czech legislation.
 Besides legal terms and conditions to harmonize public procurement in the EU member states, these directives also define standard forms for EU public procurement notices,^[<http://simap.ted.europa.eu/web/simap/standard-forms-for-public-procurement>] which constitute a common schema of public notices.
 The directives design Tenders Electronic Daily ("Supplement to the Official Journal")^[<http://ted.europa.eu>] to serve as the central repository of public notices conforming to the standard forms.
 
@@ -152,16 +152,16 @@ As in open procedures, contracting authorities announce contracts publicly, but
 Contracting authorities then screen the interested bidders and send invitations to tender to the selected bidders.
 
 The chosen procedure type determines for which users is matchmaking relevant.
-Bidders can use matchmaking both in case of open and restricted procedures to be alerted about the current business opportunities in public procurement that are relevant for them.
+Bidders can use matchmaking both in case of open and restricted procedures to be alerted about the current business opportunities in public procurement that are relevant to them.
 Contracting authorities can use matchmaking in restricted procedures to get recommendations of suitable bidders.
 <!-- A potential issue: A restricted procedure is probably chosen when the contracting authority already knows which bidders to invite. -->
 Moreover, in case of the simplified under limit procedure, which is allowed in the Czech Republic for public contracts below a specified financial threshold, contracting authority can approach bidders directly.
-In such case, at least five bidders must be approached according to the law no. 2016/134 [@CzechRepublic2016]. <!-- <https://www.zakonyprolidi.cz/cs/2016-134#p53> -->
+In such case, at least five bidders must be approached according to the act no. 2016/134 [@CzechRepublic2016]. <!-- <https://www.zakonyprolidi.cz/cs/2016-134#p53> -->
 In that scenario, matchmaking can help recommend appropriate bidders to interest in the public contract.
 There are also other procedure types, such as innovation partnership, in which matchmaking is applicable to a lesser extent.
 
 An additional use case for similarity-based retrieval employed by matchmaking may occur during contract specification.
-The Czech law no. 2016/134 [@CzechRepublic2016] suggests contracting authorities to estimate contract price based on similar contracts. <!-- <https://www.zakonyprolidi.cz/cs/2016-134#f5805154> -->
+The Czech act no. 2016/134 [@CzechRepublic2016] suggests contracting authorities to estimate contract price based on similar contracts. <!-- <https://www.zakonyprolidi.cz/cs/2016-134#f5805154> -->
 In order to address this use case, based on incomplete descriptions of contracts matchmaking can recommend similar contracts, the actual prices of which can help estimate the price of the formulated contract.
 
 <!--
diff --git a/parts/matchmaking.md b/parts/1.05_matchmaking.md
similarity index 100%
rename from parts/matchmaking.md
rename to parts/1.05_matchmaking.md
diff --git a/parts/case_based_reasoning.md b/parts/1.06_case_based_reasoning.md
similarity index 100%
rename from parts/case_based_reasoning.md
rename to parts/1.06_case_based_reasoning.md
diff --git a/parts/statistical_relational_learning.md b/parts/1.07_statistical_relational_learning.md
similarity index 100%
rename from parts/statistical_relational_learning.md
rename to parts/1.07_statistical_relational_learning.md
diff --git a/parts/related_work.md b/parts/1.08_related_work.md
similarity index 100%
rename from parts/related_work.md
rename to parts/1.08_related_work.md
diff --git a/parts/data_preparation.md b/parts/2.00_data_preparation.md
similarity index 100%
rename from parts/data_preparation.md
rename to parts/2.00_data_preparation.md
diff --git a/parts/modelling.md b/parts/2.01_modelling.md
similarity index 100%
rename from parts/modelling.md
rename to parts/2.01_modelling.md
diff --git a/parts/public_contracts_ontology.md b/parts/2.02_public_contracts_ontology.md
similarity index 100%
rename from parts/public_contracts_ontology.md
rename to parts/2.02_public_contracts_ontology.md
diff --git a/parts/concrete_data_model.md b/parts/2.03_concrete_data_model.md
similarity index 100%
rename from parts/concrete_data_model.md
rename to parts/2.03_concrete_data_model.md
diff --git a/parts/extraction.md b/parts/2.04_extraction.md
similarity index 100%
rename from parts/extraction.md
rename to parts/2.04_extraction.md
diff --git a/parts/transformation.md b/parts/2.05_transformation.md
similarity index 100%
rename from parts/transformation.md
rename to parts/2.05_transformation.md
diff --git a/parts/linking.md b/parts/2.06_linking.md
similarity index 100%
rename from parts/linking.md
rename to parts/2.06_linking.md
diff --git a/parts/geocoding.md b/parts/2.07_geocoding.md
similarity index 100%
rename from parts/geocoding.md
rename to parts/2.07_geocoding.md
diff --git a/parts/linked_datasets.md b/parts/2.08_linked_datasets.md
similarity index 100%
rename from parts/linked_datasets.md
rename to parts/2.08_linked_datasets.md
diff --git a/parts/cpv.md b/parts/2.09_cpv.md
similarity index 100%
rename from parts/cpv.md
rename to parts/2.09_cpv.md
diff --git a/parts/ares.md b/parts/2.10_ares.md
similarity index 100%
rename from parts/ares.md
rename to parts/2.10_ares.md
diff --git a/parts/czech_addresses.md b/parts/2.11_czech_addresses.md
similarity index 100%
rename from parts/czech_addresses.md
rename to parts/2.11_czech_addresses.md
diff --git a/parts/zindex.md b/parts/2.12_zindex.md
similarity index 100%
rename from parts/zindex.md
rename to parts/2.12_zindex.md
diff --git a/parts/fusion.md b/parts/2.13_fusion.md
similarity index 100%
rename from parts/fusion.md
rename to parts/2.13_fusion.md
diff --git a/parts/loading.md b/parts/2.14_loading.md
similarity index 100%
rename from parts/loading.md
rename to parts/2.14_loading.md
diff --git a/parts/loading_sparql.md b/parts/2.15_loading_sparql.md
similarity index 100%
rename from parts/loading_sparql.md
rename to parts/2.15_loading_sparql.md
diff --git a/parts/loading_rescal.md b/parts/2.16_loading_rescal.md
similarity index 100%
rename from parts/loading_rescal.md
rename to parts/2.16_loading_rescal.md
diff --git a/parts/data_summary.md b/parts/2.17_data_summary.md
similarity index 100%
rename from parts/data_summary.md
rename to parts/2.17_data_summary.md
diff --git a/parts/methods.md b/parts/3.00_methods.md
similarity index 100%
rename from parts/methods.md
rename to parts/3.00_methods.md
diff --git a/parts/ground_truth.md b/parts/3.01_ground_truth.md
similarity index 100%
rename from parts/ground_truth.md
rename to parts/3.01_ground_truth.md
diff --git a/parts/sparql.md b/parts/3.02_sparql.md
similarity index 99%
rename from parts/sparql.md
rename to parts/3.02_sparql.md
index 0f0b9a1..fcc134b 100644
--- a/parts/sparql.md
+++ b/parts/3.02_sparql.md
@@ -117,7 +117,7 @@ Note that it is possible to infer a concept already included in the explicitly a
 In such case, the concept appears twice in the contract object, distinguished by its concept assignment.
 Similarly, the same inferred concept can be reached more times by expanding different concepts.
 Such concept is present once in the results of query expansion since the results form a set.
-Figures [@fig:expand-to-narrower] and [@fig:expand-to-broader] illustrate the query expansion, showing expansions to two-hop neighbourhoods. 
+The figures [-@fig:expand-to-broader] and [-@fig:expand-to-narrower] illustrate the query expansion, showing expansions to two-hop neighbourhoods. 
 
 ![Expansion to broader concepts](img/query_expansion_broader.png){#fig:expand-to-broader width=50%}
 
diff --git a/parts/tensor_factorization.md b/parts/3.03_tensor_factorization.md
similarity index 100%
rename from parts/tensor_factorization.md
rename to parts/3.03_tensor_factorization.md
diff --git a/parts/evaluation.md b/parts/4.00_evaluation.md
similarity index 100%
rename from parts/evaluation.md
rename to parts/4.00_evaluation.md
diff --git a/parts/offline_evaluation.md b/parts/4.01_offline_evaluation.md
similarity index 100%
rename from parts/offline_evaluation.md
rename to parts/4.01_offline_evaluation.md
diff --git a/parts/results_sparql.md b/parts/4.02_results_sparql.md
similarity index 100%
rename from parts/results_sparql.md
rename to parts/4.02_results_sparql.md
diff --git a/parts/results_rescal.md b/parts/4.03_results_rescal.md
similarity index 100%
rename from parts/results_rescal.md
rename to parts/4.03_results_rescal.md
diff --git a/parts/results_comparison.md b/parts/4.04_results_comparison.md
similarity index 100%
rename from parts/results_comparison.md
rename to parts/4.04_results_comparison.md
diff --git a/parts/conclusions.md b/parts/5.00_conclusions.md
similarity index 100%
rename from parts/conclusions.md
rename to parts/5.00_conclusions.md
diff --git a/parts/references.md b/parts/A_references.md
similarity index 63%
rename from parts/references.md
rename to parts/A_references.md
index e3de9d3..1f96952 100644
--- a/parts/references.md
+++ b/parts/A_references.md
@@ -1,3 +1,6 @@
 \footnotesize
 
 # References {.unnumbered}
+
+<div id="refs"></div>
+
diff --git a/parts/software.md b/parts/B_software.md
similarity index 100%
rename from parts/software.md
rename to parts/B_software.md
diff --git a/parts/abbreviations.md b/parts/C_abbreviations.md
similarity index 100%
rename from parts/abbreviations.md
rename to parts/C_abbreviations.md
diff --git a/parts/metadata.yaml b/parts/metadata.yaml
new file mode 100644
index 0000000..10063da
--- /dev/null
+++ b/parts/metadata.yaml
@@ -0,0 +1,14 @@
+---
+title: Matchmaking of bidders and public contracts using linked open data
+author: Jindřich Mynarz
+institute: Department of Information and Knowledge Engineering, University of Economics
+date: 2017
+keywords:
+- matchmaking
+- recommender systems
+- case-based reasoning
+- linked data
+- open data
+- public procurement
+link-citations: true
+---
diff --git a/parts/acknowledgements.md b/staging/0.00_acknowledgements.md
similarity index 100%
rename from parts/acknowledgements.md
rename to staging/0.00_acknowledgements.md
diff --git a/parts/abstract_english.md b/staging/0.01_abstract_english.md
similarity index 100%
rename from parts/abstract_english.md
rename to staging/0.01_abstract_english.md
diff --git a/parts/abstract_czech.md b/staging/0.02_abstract_czech.md
similarity index 100%
rename from parts/abstract_czech.md
rename to staging/0.02_abstract_czech.md
diff --git a/text.md b/text.md
deleted file mode 100644
index 2b3010c..0000000
--- a/text.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-title: Matchmaking of bidders and public contracts using linked open data
-author: Jindřich Mynarz
-institute: Department of Information and Knowledge Engineering, University of Economics
-date: 2017
-keywords:
-- matchmaking
-- recommender systems
-- case-based reasoning
-- linked data
-- open data
-- public procurement
-link-citations: true
----
-
-```include
-parts/acknowledgements.md
-parts/abstract_english.md
-parts/abstract_czech.md
-parts/introduction.md
-parts/linked_open_data.md
-parts/open_data.md
-parts/linked_data.md
-parts/public_procurement_domain.md
-parts/matchmaking.md
-parts/case_based_reasoning.md
-parts/statistical_relational_learning.md
-parts/related_work.md
-parts/data_preparation.md
-parts/modelling.md
-parts/public_contracts_ontology.md
-parts/concrete_data_model.md
-parts/extraction.md
-parts/transformation.md
-parts/linking.md
-parts/geocoding.md
-parts/linked_datasets.md
-parts/cpv.md
-parts/ares.md
-parts/czech_addresses.md
-parts/zindex.md
-parts/fusion.md
-parts/loading.md
-parts/loading_sparql.md
-parts/loading_rescal.md
-parts/data_summary.md
-parts/methods.md
-parts/ground_truth.md
-parts/sparql.md
-parts/tensor_factorization.md
-parts/evaluation.md
-parts/offline_evaluation.md
-parts/results_sparql.md
-parts/results_rescal.md
-parts/results_comparison.md
-parts/conclusions.md
-parts/references.md
-```
-
-<div id="refs"></div>
-
-```include
-parts/software.md
-parts/abbreviations.md
-```