diff --git a/img/logo-fsf.org.png b/img/logos/fsf.org.png
similarity index 100%
rename from img/logo-fsf.org.png
rename to img/logos/fsf.org.png
diff --git a/img/logo-gnu.png b/img/logos/gnu.png
similarity index 100%
rename from img/logo-gnu.png
rename to img/logos/gnu.png
diff --git a/img/logo-gpul.png b/img/logos/gpul.png
similarity index 100%
rename from img/logo-gpul.png
rename to img/logos/gpul.png
diff --git a/img/tux.png b/img/logos/linux-tux.png
similarity index 100%
rename from img/tux.png
rename to img/logos/linux-tux.png
diff --git a/img/logo-osi.png b/img/logos/osi.png
similarity index 100%
rename from img/logo-osi.png
rename to img/logos/osi.png
diff --git a/main.tex b/main.tex
index 9889559..6848061 100644
--- a/main.tex
+++ b/main.tex
@@ -19,7 +19,7 @@
 
 \date{\today}
 
-\logo{\includegraphics[height=1cm]{img/logo-gpul.png}}
+\logo{\includegraphics[height=1cm]{img/logos/gpul}}
 
 \begin{document}
 	
@@ -42,9 +42,11 @@
 		\end{block}
 		
 		\vspace{0.5em}
-		\begin{center}
-			\includegraphics[width=0.7\linewidth]{img/logo-fsf.org}
-		\end{center}
+		\begin{figure}
+			\centering
+			\includegraphics[width=0.7\linewidth]{img/logos/fsf.org}
+			\label{fig:logo-fsf}
+		\end{figure}
 	\end{frame}
 	
 	\subsection{Open source}
@@ -60,9 +62,11 @@
 	\end{itemize}
 	
 	\vspace{0.5em}
-	\begin{center}
-		\includegraphics[width=0.6\linewidth]{img/logo-osi.png}
-	\end{center}
+	\begin{figure}
+		\centering
+		\includegraphics[width=0.6\linewidth]{img/logos/osi}
+		\label{fig:logo-osi}
+	\end{figure}
 	
 	\cite{gnu_open_source}
 	\cite{open_source_def}
@@ -84,9 +88,11 @@
 	\end{itemize}
 	
 	\vspace{0.5em}
-	\begin{center}
-		\includegraphics[width=0.2\linewidth]{img/tux.png}
-	\end{center}
+	\begin{figure}
+		\centering
+		\includegraphics[width=0.2\linewidth]{img/logos/linux-tux}
+		\label{fig:tux}
+	\end{figure}
 	\end{frame}
 	
 	\begin{frame}
@@ -106,9 +112,11 @@
 		\end{itemize}
 		
 		\vspace{0.5em}
-		\begin{center}
-			\includegraphics[width=0.2\linewidth]{img/logo-gnu.png}
-		\end{center}
+		\begin{figure}
+			\centering
+			\includegraphics[width=0.2\linewidth]{img/logos/gnu}
+			\label{fig:logo-gnu}
+		\end{figure}
 		
 		\vspace{-2em}
 		\cite{gnu_linux}