diff --git a/main.tex b/main.tex
index 31dddff..2d666c1 100644
--- a/main.tex
+++ b/main.tex
@@ -32,7 +32,9 @@
 
 \import{chapter/}{baseconf}
 
-\import{chapter/}{protocols}
+\import{chapter/}{layer2protocols}
+
+\import{chapter/}{layer3protocols}
 
 \import{chapter/}{internet}
 
diff --git a/structure.tex b/structure.tex
index b7d9ba9..82050c6 100644
--- a/structure.tex
+++ b/structure.tex
@@ -19,32 +19,11 @@
 \usepackage{titlepic}
 
 
-\input{layout/color} % Load user-defined colors. Some which are used when generating source code listings
+\geometry{a4paper,margin=2cm}
+\setlength{\columnsep}{1.5cm}
+\setlength{\headheight}{15pt}
 
 
-\geometry{a4paper,margin=4em}
-
-
-\lstdefinestyle{mystyle}{
-    backgroundcolor=\color{backcolour},   
-    commentstyle=\color{codegreen},
-    keywordstyle=\color{magenta},
-    numberstyle=\tiny\color{codegray},
-    stringstyle=\color{codepurple},
-    basicstyle=\footnotesize,
-    breakatwhitespace=false,         
-    breaklines=true,                 
-    captionpos=b,                    
-    keepspaces=true,                 
-    numbers=left,                    
-    numbersep=5pt,                  
-    showspaces=false,                
-    showstringspaces=false,
-    showtabs=false,                  
-    tabsize=4
-}
-\lstset{style=mystyle}
-
 % Path where images are located relative
 % to the file main.tex
 \graphicspath{{img/}{figures/}}
@@ -75,8 +54,27 @@
 \setlist[itemize,1]{leftmargin=\dimexpr 26pt-.2cm}
 \setlist[itemize,2]{leftmargin=\dimexpr 26pt-.3cm}
 
-\setlength{\headheight}{15pt}
-\setlength{\columnsep}{2em}
 
+\subimport{.}{commands} % Import user-defined commands
 
-\subimport{./}{commands} % Import user-defined commands
\ No newline at end of file
+\input{layout/color} %user-defined colors
+
+\lstdefinestyle{mystyle}{
+    backgroundcolor=\color{backcolour},   
+    commentstyle=\color{codegreen},
+    keywordstyle=\color{magenta},
+    numberstyle=\tiny\color{codegray},
+    stringstyle=\color{codepurple},
+    basicstyle=\footnotesize,
+    breakatwhitespace=false,         
+    breaklines=true,                 
+    captionpos=b,                    
+    keepspaces=true,                 
+    numbers=left,                    
+    numbersep=5pt,                  
+    showspaces=false,                
+    showstringspaces=false,
+    showtabs=false,                  
+    tabsize=4
+}
+\lstset{style=mystyle}
\ No newline at end of file