diff --git a/.gitignore b/.gitignore
index 57797e0..97496bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 /build/
 /doc/
 /update_gh-pages.sh
-/src/examples/example99*
+/examples/example99*
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73fdaa3..f320c96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,7 @@ endif()
 
 # Examples
 if(WITH_EXAMPLES)
-    file(GLOB sources_examples src/examples/*.cpp)
+    file(GLOB sources_examples examples/*.cpp)
     foreach(src ${sources_examples})
         get_filename_component(bin ${src} NAME_WE)
         add_executable(${bin} ${src})
@@ -81,7 +81,7 @@ endif()
 # Tests
 if(WITH_TESTS)
     include(CTest)
-    file(GLOB sources_tests src/tests/test_*.cpp)
+    file(GLOB sources_tests tests/test_*.cpp)
     foreach(src ${sources_tests})
         get_filename_component(bin ${src} NAME_WE)
         add_executable(${bin} ${src})
diff --git a/src/examples/example01_dump_json.cpp b/examples/example01_dump_json.cpp
similarity index 100%
rename from src/examples/example01_dump_json.cpp
rename to examples/example01_dump_json.cpp
diff --git a/src/examples/example02_parse_account.cpp b/examples/example02_parse_account.cpp
similarity index 100%
rename from src/examples/example02_parse_account.cpp
rename to examples/example02_parse_account.cpp
diff --git a/src/examples/example03_mastocron.cpp b/examples/example03_mastocron.cpp
similarity index 100%
rename from src/examples/example03_mastocron.cpp
rename to examples/example03_mastocron.cpp
diff --git a/src/examples/example04_update_credentials.cpp b/examples/example04_update_credentials.cpp
similarity index 100%
rename from src/examples/example04_update_credentials.cpp
rename to examples/example04_update_credentials.cpp
diff --git a/src/examples/example05_follow_unfollow.cpp b/examples/example05_follow_unfollow.cpp
similarity index 100%
rename from src/examples/example05_follow_unfollow.cpp
rename to examples/example05_follow_unfollow.cpp
diff --git a/src/examples/example06_toot_delete-toot.cpp b/examples/example06_toot_delete-toot.cpp
similarity index 100%
rename from src/examples/example06_toot_delete-toot.cpp
rename to examples/example06_toot_delete-toot.cpp
diff --git a/src/examples/example07_register_app.cpp b/examples/example07_register_app.cpp
similarity index 100%
rename from src/examples/example07_register_app.cpp
rename to examples/example07_register_app.cpp
diff --git a/src/examples/example08_rate_limiting.cpp b/examples/example08_rate_limiting.cpp
similarity index 100%
rename from src/examples/example08_rate_limiting.cpp
rename to examples/example08_rate_limiting.cpp
diff --git a/src/examples/example09_streaming_api.cpp b/examples/example09_streaming_api.cpp
similarity index 100%
rename from src/examples/example09_streaming_api.cpp
rename to examples/example09_streaming_api.cpp
diff --git a/src/examples/example10_simplify.cpp b/examples/example10_simplify.cpp
similarity index 100%
rename from src/examples/example10_simplify.cpp
rename to examples/example10_simplify.cpp
diff --git a/src/examples/example11_post_media.cpp b/examples/example11_post_media.cpp
similarity index 100%
rename from src/examples/example11_post_media.cpp
rename to examples/example11_post_media.cpp
diff --git a/packages/gentoo/mastodon-cpp-0.0.0.ebuild b/packages/gentoo/mastodon-cpp-0.0.0.ebuild
index 87be06a..d76bc2b 100644
--- a/packages/gentoo/mastodon-cpp-0.0.0.ebuild
+++ b/packages/gentoo/mastodon-cpp-0.0.0.ebuild
@@ -44,7 +44,7 @@ src_install() {
 
     if use examples; then
         docinto examples
-        for file in src/examples/*.cpp; do
+        for file in examples/*.cpp; do
             dodoc ${file}
         done
     fi
diff --git a/packages/gentoo/mastodon-cpp-9999.ebuild b/packages/gentoo/mastodon-cpp-9999.ebuild
index 5d4d275..b28db04 100644
--- a/packages/gentoo/mastodon-cpp-9999.ebuild
+++ b/packages/gentoo/mastodon-cpp-9999.ebuild
@@ -52,7 +52,7 @@ src_install() {
 
     if use examples; then
         docinto examples
-        for file in src/examples/*.cpp; do
+        for file in examples/*.cpp; do
             dodoc ${file}
         done
     fi
diff --git a/src/tests/test_00_library_is_loadable.cpp b/tests/test_00_library_is_loadable.cpp
similarity index 78%
rename from src/tests/test_00_library_is_loadable.cpp
rename to tests/test_00_library_is_loadable.cpp
index 8565086..8ce4269 100644
--- a/src/tests/test_00_library_is_loadable.cpp
+++ b/tests/test_00_library_is_loadable.cpp
@@ -1,7 +1,7 @@
 /*  This file is part of mastodon-cpp.
  */
 
-#include "../mastodon-cpp.hpp"
+#include "mastodon-cpp.hpp"
 
 int main(int argc, char *argv[])
 {
diff --git a/src/tests/test_01_get_instance.cpp b/tests/test_01_get_instance.cpp
similarity index 93%
rename from src/tests/test_01_get_instance.cpp
rename to tests/test_01_get_instance.cpp
index b43b72c..9d88fbb 100644
--- a/src/tests/test_01_get_instance.cpp
+++ b/tests/test_01_get_instance.cpp
@@ -3,7 +3,7 @@
 
 #include <iostream>
 #include <cstdint>
-#include "../mastodon-cpp.hpp"
+#include "mastodon-cpp.hpp"
 
 int main(int argc, char *argv[])
 {