diff --git a/CMakeLists.txt b/CMakeLists.txt
index e90ebc0..5fe21ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,10 @@ include_directories(${SNDFILE_INCLUDE_DIRS})
 pkg_search_module(FFTW3F REQUIRED fftw3f)
 include_directories(${FFTW3F_INCLUDE_DIRS})
 
-aux_source_directory(src SOURCE_FILES)
-add_executable(glTest ${SOURCE_FILES})
+aux_source_directory(src MAIN_SOURCE_FILES)
+aux_source_directory(src/Audio AUDIO_SOURCE_FILES)
+aux_source_directory(src/GLObjects GLOBJECTS_SOURCE_FILES)
+aux_source_directory(src/Shaders SHADERS_SOURCE_FILES)
+
+add_executable(glTest ${MAIN_SOURCE_FILES} ${AUDIO_SOURCE_FILES} ${GLOBJECTS_SOURCE_FILES} ${SHADERS_SOURCE_FILES})
 target_link_libraries(glTest ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} ${GLEW_LIBRARIES} ${PORTAUDIO_LIBRARIES} ${SNDFILE_LIBRARIES} ${FFTW3F_LIBRARIES})
diff --git a/src/AudioPlayer.cpp b/src/Audio/AudioPlayer.cpp
similarity index 100%
rename from src/AudioPlayer.cpp
rename to src/Audio/AudioPlayer.cpp
diff --git a/src/AudioPlayer.h b/src/Audio/AudioPlayer.h
similarity index 100%
rename from src/AudioPlayer.h
rename to src/Audio/AudioPlayer.h
diff --git a/src/ISndSource.h b/src/Audio/ISndSource.h
similarity index 100%
rename from src/ISndSource.h
rename to src/Audio/ISndSource.h
diff --git a/src/WavSource.cpp b/src/Audio/WavSource.cpp
similarity index 100%
rename from src/WavSource.cpp
rename to src/Audio/WavSource.cpp
diff --git a/src/WavSource.h b/src/Audio/WavSource.h
similarity index 100%
rename from src/WavSource.h
rename to src/Audio/WavSource.h
diff --git a/src/GLObject.cpp b/src/GLObjects/GLObject.cpp
similarity index 100%
rename from src/GLObject.cpp
rename to src/GLObjects/GLObject.cpp
diff --git a/src/GLObject.h b/src/GLObjects/GLObject.h
similarity index 95%
rename from src/GLObject.h
rename to src/GLObjects/GLObject.h
index 49570b7..cc94ae6 100644
--- a/src/GLObject.h
+++ b/src/GLObjects/GLObject.h
@@ -6,7 +6,7 @@
 #define GLTEST_GLOBJECT_H
 
 #include "IGLObject.h"
-#include "ShaderProgram.h"
+#include "../Shaders/ShaderProgram.h"
 #include "vertex.h"
 
 #include <tuple>
diff --git a/src/IGLObject.h b/src/GLObjects/IGLObject.h
similarity index 100%
rename from src/IGLObject.h
rename to src/GLObjects/IGLObject.h
diff --git a/src/Mesh.cpp b/src/GLObjects/Mesh.cpp
similarity index 100%
rename from src/Mesh.cpp
rename to src/GLObjects/Mesh.cpp
diff --git a/src/Mesh.h b/src/GLObjects/Mesh.h
similarity index 94%
rename from src/Mesh.h
rename to src/GLObjects/Mesh.h
index bada61e..d81f706 100644
--- a/src/Mesh.h
+++ b/src/GLObjects/Mesh.h
@@ -6,7 +6,7 @@
 #define GLTEST_MESH_H
 
 #include "vertex.h"
-#include "ShaderProgram.h"
+#include "../Shaders/ShaderProgram.h"
 #include "GLObject.h"
 
 #include <cstddef>
diff --git a/src/SpectralMesh.cpp b/src/GLObjects/SpectralMesh.cpp
similarity index 100%
rename from src/SpectralMesh.cpp
rename to src/GLObjects/SpectralMesh.cpp
diff --git a/src/SpectralMesh.h b/src/GLObjects/SpectralMesh.h
similarity index 100%
rename from src/SpectralMesh.h
rename to src/GLObjects/SpectralMesh.h
diff --git a/src/WaveMesh.cpp b/src/GLObjects/WaveMesh.cpp
similarity index 100%
rename from src/WaveMesh.cpp
rename to src/GLObjects/WaveMesh.cpp
diff --git a/src/WaveMesh.h b/src/GLObjects/WaveMesh.h
similarity index 100%
rename from src/WaveMesh.h
rename to src/GLObjects/WaveMesh.h
diff --git a/src/vertex.h b/src/GLObjects/vertex.h
similarity index 100%
rename from src/vertex.h
rename to src/GLObjects/vertex.h
diff --git a/src/ShaderProgram.cpp b/src/Shaders/ShaderProgram.cpp
similarity index 100%
rename from src/ShaderProgram.cpp
rename to src/Shaders/ShaderProgram.cpp
diff --git a/src/ShaderProgram.h b/src/Shaders/ShaderProgram.h
similarity index 100%
rename from src/ShaderProgram.h
rename to src/Shaders/ShaderProgram.h
diff --git a/src/main.cpp b/src/main.cpp
index 923102c..d8c2b5b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,22 +1,15 @@
-#include <GL/glew.h>
+#include "Shaders/ShaderProgram.h"
+#include "GLObjects/WaveMesh.h"
+#include "Audio/AudioPlayer.h"
+#include "GLObjects/SpectralMesh.h"
+
 #include <GLFW/glfw3.h>
-
-#include "ShaderProgram.h"
-#include "WaveMesh.h"
-#include "AudioPlayer.h"
-#include "SpectralMesh.h"
-
-#include <portaudio.h>
-#include <sndfile.h>
+#include <glm/gtc/matrix_transform.hpp>
+#include <glm/gtc/type_ptr.hpp>
 
 #include <iostream>
 #include <fstream>
 #include <sstream>
-#include <cmath>
-
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/type_ptr.hpp>
-
 
 glm::vec3 eye(0.0f, 0.0f, 4.0f), at(0.0f, 0.0f, 0.0f), up(0.0f, 1.0f, 0.0f);
 glm::mat4 mView = glm::lookAt(eye, at, up);