diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e148be..f06f260 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.5)
 project(owo)
-add_executable(owo owo.cpp)
-add_subdirectory(clip-lib)
+add_executable(owo src/main.cpp)
+add_subdirectory(src/clip-lib)
 target_link_libraries(owo clip)
 
diff --git a/clip-lib/CMakeLists.txt b/src/clip-lib/CMakeLists.txt
similarity index 100%
rename from clip-lib/CMakeLists.txt
rename to src/clip-lib/CMakeLists.txt
diff --git a/clip-lib/CONTRIBUTING.md b/src/clip-lib/CONTRIBUTING.md
similarity index 100%
rename from clip-lib/CONTRIBUTING.md
rename to src/clip-lib/CONTRIBUTING.md
diff --git a/clip-lib/README.md b/src/clip-lib/README.md
similarity index 100%
rename from clip-lib/README.md
rename to src/clip-lib/README.md
diff --git a/clip-lib/clip.cpp b/src/clip-lib/clip.cpp
similarity index 100%
rename from clip-lib/clip.cpp
rename to src/clip-lib/clip.cpp
diff --git a/clip-lib/clip.h b/src/clip-lib/clip.h
similarity index 100%
rename from clip-lib/clip.h
rename to src/clip-lib/clip.h
diff --git a/clip-lib/clip_common.h b/src/clip-lib/clip_common.h
similarity index 100%
rename from clip-lib/clip_common.h
rename to src/clip-lib/clip_common.h
diff --git a/clip-lib/clip_lock_impl.h b/src/clip-lib/clip_lock_impl.h
similarity index 100%
rename from clip-lib/clip_lock_impl.h
rename to src/clip-lib/clip_lock_impl.h
diff --git a/clip-lib/clip_none.cpp b/src/clip-lib/clip_none.cpp
similarity index 100%
rename from clip-lib/clip_none.cpp
rename to src/clip-lib/clip_none.cpp
diff --git a/clip-lib/clip_osx.h b/src/clip-lib/clip_osx.h
similarity index 100%
rename from clip-lib/clip_osx.h
rename to src/clip-lib/clip_osx.h
diff --git a/clip-lib/clip_osx.mm b/src/clip-lib/clip_osx.mm
similarity index 100%
rename from clip-lib/clip_osx.mm
rename to src/clip-lib/clip_osx.mm
diff --git a/clip-lib/clip_win.cpp b/src/clip-lib/clip_win.cpp
similarity index 100%
rename from clip-lib/clip_win.cpp
rename to src/clip-lib/clip_win.cpp
diff --git a/clip-lib/clip_win.h b/src/clip-lib/clip_win.h
similarity index 100%
rename from clip-lib/clip_win.h
rename to src/clip-lib/clip_win.h
diff --git a/clip-lib/clip_win_bmp.cpp b/src/clip-lib/clip_win_bmp.cpp
similarity index 100%
rename from clip-lib/clip_win_bmp.cpp
rename to src/clip-lib/clip_win_bmp.cpp
diff --git a/clip-lib/clip_win_bmp.h b/src/clip-lib/clip_win_bmp.h
similarity index 100%
rename from clip-lib/clip_win_bmp.h
rename to src/clip-lib/clip_win_bmp.h
diff --git a/clip-lib/clip_win_wic.cpp b/src/clip-lib/clip_win_wic.cpp
similarity index 100%
rename from clip-lib/clip_win_wic.cpp
rename to src/clip-lib/clip_win_wic.cpp
diff --git a/clip-lib/clip_win_wic.h b/src/clip-lib/clip_win_wic.h
similarity index 100%
rename from clip-lib/clip_win_wic.h
rename to src/clip-lib/clip_win_wic.h
diff --git a/clip-lib/clip_x11.cpp b/src/clip-lib/clip_x11.cpp
similarity index 100%
rename from clip-lib/clip_x11.cpp
rename to src/clip-lib/clip_x11.cpp
diff --git a/clip-lib/clip_x11_png.h b/src/clip-lib/clip_x11_png.h
similarity index 100%
rename from clip-lib/clip_x11_png.h
rename to src/clip-lib/clip_x11_png.h
diff --git a/clip-lib/image.cpp b/src/clip-lib/image.cpp
similarity index 100%
rename from clip-lib/image.cpp
rename to src/clip-lib/image.cpp
diff --git a/owo.cpp b/src/main.cpp
similarity index 99%
rename from owo.cpp
rename to src/main.cpp
index 3cc3e32..49098a1 100644
--- a/owo.cpp
+++ b/src/main.cpp
@@ -106,7 +106,7 @@ int help() {
 }
 
 int main(int argc, char *argv[]) {
-    srand(time(NULL));
+    srand(time(nullptr));
     string input, inputfile, outputfile;
     bool _stdin = false, clipboard = false, no_full_word = false, no_random_ending = false;