diff --git a/GeneralRules.tex b/GeneralRules.tex
index c057e985..cba4fd39 100644
--- a/GeneralRules.tex
+++ b/GeneralRules.tex
@@ -12,27 +12,27 @@ \chapter{General Rules and Regulations}
 Every rule in this section can be considered to implicitly include the term \emph{\enquote{unless stated otherwise}}.
 This means that additional or contrary rules, in particular with respect to the specification of tests, have a higher priority than those mentioned in the general rules and regulations.
 
-\input{general_rules/TeamRegistration}
+%\input{general_rules/TeamRegistration}
 
-\input{general_rules/vizbox}
+%\input{general_rules/vizbox}
 
 \input{general_rules/Scenario}
 
-\input{general_rules/Robots}
+%\input{general_rules/Robots}
 
-\input{general_rules/ExternalDevices}
+%\input{general_rules/ExternalDevices}
 
-\input{general_rules/Organization}
+%\input{general_rules/Organization}
 
-\input{general_rules/Procedure}
+%\input{general_rules/Procedure}
 
 \input{general_rules/ContinueRules.tex}
 
 \input{general_rules/PenaltiesBonuses}
 
-\input{general_rules/OpenChallenge}
+%\input{general_rules/OpenChallenge}
 
-\input{general_rules/ManipulationChallenge}
+%\input{general_rules/ManipulationChallenge}
 % Local Variables:
 % TeX-master: "Rulebook"
 % End:
diff --git a/Introduction.tex b/Introduction.tex
index 008a54a8..7d150914 100644
--- a/Introduction.tex
+++ b/Introduction.tex
@@ -21,15 +21,15 @@ \section{RoboCup@Home}
 The focus is on, but is not limited to, the following domains: human-robot interaction and cooperation, navigation and mapping in dynamic environments, computer vision and object recognition under natural light conditions, object manipulation, adaptive behaviors, behavior integration, ambient intelligence, standardization and system integration.
 The competition is co-located with the RoboCup symposium.
 
-\input{introduction/Organization}
+%\input{introduction/Organization}
 
-\input{introduction/Infrastructure}
+%\input{introduction/Infrastructure}
 
-\input{introduction/Leagues}
+%\input{introduction/Leagues}
 
 \input{introduction/Competition}
 
-\input{introduction/Awards}
+%\input{introduction/Awards}
 
 % Local Variables:
 % TeX-master: "Rulebook"
diff --git a/Organization.tex b/Organization.tex
new file mode 100644
index 00000000..79aa2cca
--- /dev/null
+++ b/Organization.tex
@@ -0,0 +1,60 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%%          $Id: Rulebook.tex 2014-12-12 balkce $
+%%    author(s): RoboCupAtHome Technical Committee(s)
+%%  description: introduction to RoboCupAtHome
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\documentclass[11pt, twoside, openright, a4paper, chapterprefix]{scrbook}
+\usepackage[inner=2.5cm, outer=2.5cm, top=4cm, bottom=4cm]{geometry}
+
+%%% PACKAGES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\input{./setup/packages.tex}
+\input{./setup/config.tex}
+\input{./setup/styling.tex}
+
+
+%%% MACROS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\input{./setup/active_version.tex}
+\graphicspath{{\YEAR/}{./images/}}
+\input{./setup/macros.tex}
+\input{./setup/abbrevix.tex}
+
+
+
+\makeindex                                % generate index
+\makeabbex                                % generate abbreviations
+
+
+
+
+
+%\newcommand{\sectionbreak}{\clearpage}
+%\newcommand{\subsectionbreak}{\clearpage}
+
+
+\begin{document}
+	
+	\input{./pages/titlepage}
+	
+	\setcounter{page}{0}
+	\pagenumbering{roman}
+	\pagestyle{empty}
+	\input{./pages/acknowledgments}
+	\clearpage
+	
+	\pagestyle{plain}
+	\tableofcontents
+	\clearpage
+	
+	\setcounter{page}{1}
+	\pagenumbering{arabic}
+	
+	\input{organization/Introduction}
+	\input{organization/GeneralRules}
+	\input{Setup}	
+	
+	\printabx
+	\printidx
+	
+\end{document}
diff --git a/Roadmap.tex b/Roadmap.tex
new file mode 100644
index 00000000..42a83d79
--- /dev/null
+++ b/Roadmap.tex
@@ -0,0 +1,60 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%%          $Id: Rulebook.tex 2014-12-12 balkce $
+%%    author(s): RoboCupAtHome Technical Committee(s)
+%%  description: introduction to RoboCupAtHome
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\documentclass[11pt, twoside, openright, a4paper, chapterprefix]{scrbook}
+\usepackage[inner=2.5cm, outer=2.5cm, top=4cm, bottom=4cm]{geometry}
+
+%%% PACKAGES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\input{./setup/packages.tex}
+\input{./setup/config.tex}
+\input{./setup/styling.tex}
+
+
+%%% MACROS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\input{./setup/active_version.tex}
+\graphicspath{{\YEAR/}{./images/}}
+\input{./setup/macros.tex}
+\input{./setup/abbrevix.tex}
+
+
+
+\makeindex                                % generate index
+\makeabbex                                % generate abbreviations
+
+
+
+
+
+%\newcommand{\sectionbreak}{\clearpage}
+%\newcommand{\subsectionbreak}{\clearpage}
+
+
+\begin{document}
+	
+	\input{./pages/titlepage}
+	
+	\setcounter{page}{0}
+	\pagenumbering{roman}
+	\pagestyle{empty}
+	\input{./pages/acknowledgments}
+	\clearpage
+	
+	\pagestyle{plain}
+	\tableofcontents
+	\clearpage
+	
+	\setcounter{page}{1}
+	\pagenumbering{arabic}
+	
+	\input{CompetitionConcepts}
+	
+	
+	
+	\printabx
+	\printidx
+	
+\end{document}
diff --git a/organization/GeneralRules.tex b/organization/GeneralRules.tex
new file mode 100644
index 00000000..51b11a84
--- /dev/null
+++ b/organization/GeneralRules.tex
@@ -0,0 +1,37 @@
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%%          $Id: general_rules.tex 420 2013-04-08 15:30:35Z holz $
+%%    author(s): RoboCupAtHome Technical Committee(s)
+%%  description: description of the GENERAL RULES
+%%
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\chapter{General Rules and Regulations}
+\label{chap:rules}
+
+These are the general rules and regulations for the competition in the \RoboCup\AtHome{} league.
+Every rule in this section can be considered to implicitly include the term \emph{\enquote{unless stated otherwise}}.
+This means that additional or contrary rules, in particular with respect to the specification of tests, have a higher priority than those mentioned in the general rules and regulations.
+
+\input{general_rules/TeamRegistration}
+
+\input{general_rules/vizbox}
+
+%\input{general_rules/Scenario}
+
+\input{general_rules/Robots}
+
+\input{general_rules/ExternalDevices}
+
+\input{general_rules/Organization}
+
+\input{general_rules/Procedure}
+
+%\input{general_rules/ContinueRules.tex}
+
+%\input{general_rules/PenaltiesBonuses}
+
+\input{general_rules/OpenChallenge}
+
+% Local Variables:
+% TeX-master: "Rulebook"
+% End:
diff --git a/organization/Introduction.tex b/organization/Introduction.tex
new file mode 100644
index 00000000..d2f1db3b
--- /dev/null
+++ b/organization/Introduction.tex
@@ -0,0 +1,22 @@
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%%    author(s): RoboCupAtHome Technical Committee(s)
+%%  description: Introduction
+%%
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\chapter{Introduction}
+\label{chap:introduction}
+
+\input{introduction/Organization}
+
+\input{introduction/Infrastructure}
+
+\input{introduction/Leagues}
+
+%\input{introduction/Competition}
+
+\input{introduction/Awards}
+
+% Local Variables:
+% TeX-master: "Rulebook"
+% End:
diff --git a/rulebook.tex b/rulebook.tex
index 57faeb6c..32154323 100644
--- a/rulebook.tex
+++ b/rulebook.tex
@@ -52,11 +52,11 @@
 
 \input{Introduction}
 
-\input{CompetitionConcepts}
+%\input{CompetitionConcepts}
 
 \input{GeneralRules}
 
-\input{Setup}
+%\input{Setup}