diff --git a/src/CMake/FindSDL2.cmake b/CMake/FindSDL2.cmake
similarity index 100%
rename from src/CMake/FindSDL2.cmake
rename to CMake/FindSDL2.cmake
diff --git a/src/CMakeLists.txt b/CMakeLists.txt
similarity index 68%
rename from src/CMakeLists.txt
rename to CMakeLists.txt
index 2ebe156..8ab7c1c 100644
--- a/src/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,16 +14,16 @@ include_directories(${SDL2_INCLUDE_DIR})
 
 add_library(v2m
     SHARED
-    ronan.cpp
-    v2mplayer.cpp
-    v2mconv.cpp
-    synth_core.cpp
-    sounddef.cpp
+    src/ronan.cpp
+    src/v2mplayer.cpp
+    src/v2mconv.cpp
+    src/synth_core.cpp
+    src/sounddef.cpp
 )
 set_target_properties(v2m PROPERTIES VERSION ${V2M_VERSION} SOVERSION ${MAJOR_VERSION})
 
 add_executable(v2mplayer
-    tinyplayer.cpp
+    src/tinyplayer.cpp
 )
 target_link_libraries(v2mplayer
     ${SDL2_LIBRARY}
@@ -32,6 +32,6 @@ target_link_libraries(v2mplayer
 
 install(TARGETS v2m DESTINATION lib)
 install(TARGETS v2mplayer DESTINATION bin)
-install(FILES ../man/man1/v2mplayer.1 DESTINATION share/man/man1)
-install(FILES libv2.h phonemtab.h sounddef.h synth.h types.h v2mconv.h v2mplayer.h DESTINATION include/v2m)
-install(FILES ../LICENSE ../README.md ../doc/AUTHORS ../doc/CHANGELOG ../doc/VERSION DESTINATION share/doc/v2mplayer)
+install(FILES man/man1/v2mplayer.1 DESTINATION share/man/man1)
+install(FILES src/libv2.h src/phonemtab.h src/sounddef.h src/synth.h src/types.h src/v2mconv.h src/v2mplayer.h DESTINATION include/v2m)
+install(FILES LICENSE README.md doc/AUTHORS doc/CHANGELOG doc/VERSION DESTINATION share/doc/v2mplayer)
diff --git a/README.md b/README.md
index bed3003..cdf5919 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,6 @@ This is a quick port of the tinyplayer at https://github.com/farbrausch/fr_publi
 ## Build
 
 ```
-cd src
 ccmake .
 cmake .
 make
@@ -18,7 +17,7 @@ sudo make install
 ## Usage
 
 ```
-./v2mplayer ../v2m/breeze.v2m
+./v2mplayer v2m/breeze.v2m
 ```
 
 ---