diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52366d9..1579fd8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.7)
 project (mastodon-cpp
-         VERSION 0.8.1
+         VERSION 0.8.2
          LANGUAGES CXX
 )
 
@@ -22,7 +22,8 @@ configure_file (
     "${PROJECT_BINARY_DIR}/version.hpp"
 )
 
-# Announce that we are compiling mastodon-cpp (used in easy.hpp and examples)
+# Announce that we are compiling mastodon-cpp (used to figure out where the
+# headers are)
 add_definitions(-DMASTODON_CPP=1)
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -37,7 +38,8 @@ endif()
 if(WITHOUT_EASY)
     file(GLOB sources src/*.cpp src/api/*.cpp)
 else()
-    file(GLOB sources src/*.cpp src/api/*.cpp src/easy/*.cpp)
+    file(GLOB sources src/*.cpp src/api/*.cpp
+                      src/easy/*.cpp src/easy/entities/*.cpp)
 endif()
 add_library(mastodon-cpp SHARED ${sources})
 set_target_properties(mastodon-cpp PROPERTIES
@@ -56,6 +58,9 @@ if(NOT WITHOUT_EASY)
     file(GLOB easy_header src/easy/*.hpp)
     install(FILES ${easy_header}
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mastodon-cpp/easy)
+    file(GLOB easy_entities_header src/easy/entities/*.hpp)
+    install(FILES ${easy_entities_header}
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mastodon-cpp/easy/entities)
 endif()
 
 # Documentation
diff --git a/src/easy/all.hpp b/src/easy/all.hpp
index eee9f28..e799bd8 100644
--- a/src/easy/all.hpp
+++ b/src/easy/all.hpp
@@ -20,38 +20,38 @@
 // If we are compiling mastodon-cpp, use another include path
 #ifdef MASTODON_CPP
     #include "easy/easy.hpp"
-    #include "easy/account.hpp"
-    #include "easy/application.hpp"
-    #include "easy/attachment.hpp"
-    #include "easy/card.hpp"
-    #include "easy/context.hpp"
-    #include "easy/emoji.hpp"
-    #include "easy/instance.hpp"
-    #include "easy/list.hpp"
-    #include "easy/mention.hpp"
-    #include "easy/notification.hpp"
-    #include "easy/relationship.hpp"
-    #include "easy/report.hpp"
-    #include "easy/results.hpp"
-    #include "easy/status.hpp"
-    #include "easy/tag.hpp"
+    #include "easy/entities/account.hpp"
+    #include "easy/entities/application.hpp"
+    #include "easy/entities/attachment.hpp"
+    #include "easy/entities/card.hpp"
+    #include "easy/entities/context.hpp"
+    #include "easy/entities/emoji.hpp"
+    #include "easy/entities/instance.hpp"
+    #include "easy/entities/list.hpp"
+    #include "easy/entities/mention.hpp"
+    #include "easy/entities/notification.hpp"
+    #include "easy/entities/relationship.hpp"
+    #include "easy/entities/report.hpp"
+    #include "easy/entities/results.hpp"
+    #include "easy/entities/status.hpp"
+    #include "easy/entities/tag.hpp"
 #else
     #include <mastodon-cpp/easy/easy.hpp>
-    #include <mastodon-cpp/easy/account.hpp>
-    #include <mastodon-cpp/easy/application.hpp>
-    #include <mastodon-cpp/easy/attachment.hpp>
-    #include <mastodon-cpp/easy/card.hpp>
-    #include <mastodon-cpp/easy/context.hpp>
-    #include <mastodon-cpp/easy/emoji.hpp>
-    #include <mastodon-cpp/easy/instance.hpp>
-    #include <mastodon-cpp/easy/list.hpp>
-    #include <mastodon-cpp/easy/mention.hpp>
-    #include <mastodon-cpp/easy/notification.hpp>
-    #include <mastodon-cpp/easy/relationship.hpp>
-    #include <mastodon-cpp/easy/report.hpp>
-    #include <mastodon-cpp/easy/results.hpp>
-    #include <mastodon-cpp/easy/status.hpp>
-    #include <mastodon-cpp/easy/tag.hpp>
+    #include <mastodon-cpp/entities/easy/account.hpp>
+    #include <mastodon-cpp/entities/easy/application.hpp>
+    #include <mastodon-cpp/entities/easy/attachment.hpp>
+    #include <mastodon-cpp/entities/easy/card.hpp>
+    #include <mastodon-cpp/entities/easy/context.hpp>
+    #include <mastodon-cpp/entities/easy/emoji.hpp>
+    #include <mastodon-cpp/entities/easy/instance.hpp>
+    #include <mastodon-cpp/entities/easy/list.hpp>
+    #include <mastodon-cpp/entities/easy/mention.hpp>
+    #include <mastodon-cpp/entities/easy/notification.hpp>
+    #include <mastodon-cpp/entities/easy/relationship.hpp>
+    #include <mastodon-cpp/entities/easy/report.hpp>
+    #include <mastodon-cpp/entities/easy/results.hpp>
+    #include <mastodon-cpp/entities/easy/status.hpp>
+    #include <mastodon-cpp/entities/easy/tag.hpp>
 #endif
 
 #endif  // MASTODON_CPP_EASY_ALL_HPP
diff --git a/src/easy/account.cpp b/src/easy/entities/account.cpp
similarity index 100%
rename from src/easy/account.cpp
rename to src/easy/entities/account.cpp
diff --git a/src/easy/account.hpp b/src/easy/entities/account.hpp
similarity index 100%
rename from src/easy/account.hpp
rename to src/easy/entities/account.hpp
diff --git a/src/easy/application.cpp b/src/easy/entities/application.cpp
similarity index 100%
rename from src/easy/application.cpp
rename to src/easy/entities/application.cpp
diff --git a/src/easy/application.hpp b/src/easy/entities/application.hpp
similarity index 100%
rename from src/easy/application.hpp
rename to src/easy/entities/application.hpp
diff --git a/src/easy/attachment.cpp b/src/easy/entities/attachment.cpp
similarity index 100%
rename from src/easy/attachment.cpp
rename to src/easy/entities/attachment.cpp
diff --git a/src/easy/attachment.hpp b/src/easy/entities/attachment.hpp
similarity index 100%
rename from src/easy/attachment.hpp
rename to src/easy/entities/attachment.hpp
diff --git a/src/easy/card.cpp b/src/easy/entities/card.cpp
similarity index 100%
rename from src/easy/card.cpp
rename to src/easy/entities/card.cpp
diff --git a/src/easy/card.hpp b/src/easy/entities/card.hpp
similarity index 100%
rename from src/easy/card.hpp
rename to src/easy/entities/card.hpp
diff --git a/src/easy/context.cpp b/src/easy/entities/context.cpp
similarity index 100%
rename from src/easy/context.cpp
rename to src/easy/entities/context.cpp
diff --git a/src/easy/context.hpp b/src/easy/entities/context.hpp
similarity index 95%
rename from src/easy/context.hpp
rename to src/easy/entities/context.hpp
index 18fbad4..734ff10 100644
--- a/src/easy/context.hpp
+++ b/src/easy/entities/context.hpp
@@ -24,11 +24,11 @@
 #ifdef MASTODON_CPP
     #include "mastodon-cpp.hpp"
     #include "easy/easy.hpp"
-    #include "easy/status.hpp"
+    #include "easy/entities/status.hpp"
 #else
     #include <mastodon-cpp/mastodon-cpp.hpp>
     #include <mastodon-cpp/easy/easy.hpp>
-    #include <mastodon-cpp/easy/status.hpp>
+    #include <mastodon-cpp/easy/entities/status.hpp>
 #endif
 
 using std::string;
diff --git a/src/easy/emoji.cpp b/src/easy/entities/emoji.cpp
similarity index 100%
rename from src/easy/emoji.cpp
rename to src/easy/entities/emoji.cpp
diff --git a/src/easy/emoji.hpp b/src/easy/entities/emoji.hpp
similarity index 100%
rename from src/easy/emoji.hpp
rename to src/easy/entities/emoji.hpp
diff --git a/src/easy/instance.cpp b/src/easy/entities/instance.cpp
similarity index 100%
rename from src/easy/instance.cpp
rename to src/easy/entities/instance.cpp
diff --git a/src/easy/instance.hpp b/src/easy/entities/instance.hpp
similarity index 96%
rename from src/easy/instance.hpp
rename to src/easy/entities/instance.hpp
index 0b26c69..876a159 100644
--- a/src/easy/instance.hpp
+++ b/src/easy/entities/instance.hpp
@@ -24,11 +24,11 @@
 #ifdef MASTODON_CPP
     #include "mastodon-cpp.hpp"
     #include "easy/easy.hpp"
-    #include "easy/account.hpp"
+    #include "easy/entities/account.hpp"
 #else
     #include <mastodon-cpp/mastodon-cpp.hpp>
     #include <mastodon-cpp/easy/easy.hpp>
-    #include <mastodon-cpp/easy/account.hpp>
+    #include <mastodon-cpp/easy/entities/account.hpp>
 #endif
 
 using std::string;
diff --git a/src/easy/list.cpp b/src/easy/entities/list.cpp
similarity index 100%
rename from src/easy/list.cpp
rename to src/easy/entities/list.cpp
diff --git a/src/easy/list.hpp b/src/easy/entities/list.hpp
similarity index 100%
rename from src/easy/list.hpp
rename to src/easy/entities/list.hpp
diff --git a/src/easy/mention.cpp b/src/easy/entities/mention.cpp
similarity index 100%
rename from src/easy/mention.cpp
rename to src/easy/entities/mention.cpp
diff --git a/src/easy/mention.hpp b/src/easy/entities/mention.hpp
similarity index 100%
rename from src/easy/mention.hpp
rename to src/easy/entities/mention.hpp
diff --git a/src/easy/notification.cpp b/src/easy/entities/notification.cpp
similarity index 100%
rename from src/easy/notification.cpp
rename to src/easy/entities/notification.cpp
diff --git a/src/easy/notification.hpp b/src/easy/entities/notification.hpp
similarity index 92%
rename from src/easy/notification.hpp
rename to src/easy/entities/notification.hpp
index d746eb7..45f57eb 100644
--- a/src/easy/notification.hpp
+++ b/src/easy/entities/notification.hpp
@@ -25,13 +25,13 @@
 #ifdef MASTODON_CPP
     #include "mastodon-cpp.hpp"
     #include "easy/easy.hpp"
-    #include "easy/account.hpp"
-    #include "easy/status.hpp"
+    #include "easy/entities/account.hpp"
+    #include "easy/entities/status.hpp"
 #else
     #include <mastodon-cpp/mastodon-cpp.hpp>
     #include <mastodon-cpp/easy/easy.hpp>
-    #include <mastodon-cpp/easy/account.hpp>
-    #include <mastodon-cpp/easy/status.hpp>
+    #include <mastodon-cpp/entities/easy/account.hpp>
+    #include <mastodon-cpp/entities/easy/status.hpp>
 #endif
 
 using std::string;
diff --git a/src/easy/relationship.cpp b/src/easy/entities/relationship.cpp
similarity index 100%
rename from src/easy/relationship.cpp
rename to src/easy/entities/relationship.cpp
diff --git a/src/easy/relationship.hpp b/src/easy/entities/relationship.hpp
similarity index 100%
rename from src/easy/relationship.hpp
rename to src/easy/entities/relationship.hpp
diff --git a/src/easy/report.cpp b/src/easy/entities/report.cpp
similarity index 100%
rename from src/easy/report.cpp
rename to src/easy/entities/report.cpp
diff --git a/src/easy/report.hpp b/src/easy/entities/report.hpp
similarity index 100%
rename from src/easy/report.hpp
rename to src/easy/entities/report.hpp
diff --git a/src/easy/results.cpp b/src/easy/entities/results.cpp
similarity index 100%
rename from src/easy/results.cpp
rename to src/easy/entities/results.cpp
diff --git a/src/easy/results.hpp b/src/easy/entities/results.hpp
similarity index 91%
rename from src/easy/results.hpp
rename to src/easy/entities/results.hpp
index f9167d4..e04d8b4 100644
--- a/src/easy/results.hpp
+++ b/src/easy/entities/results.hpp
@@ -24,13 +24,13 @@
 #ifdef MASTODON_CPP
     #include "mastodon-cpp.hpp"
     #include "easy/easy.hpp"
-    #include "easy/account.hpp"
-    #include "easy/status.hpp"
+    #include "easy/entities/account.hpp"
+    #include "easy/entities/status.hpp"
 #else
     #include <mastodon-cpp/mastodon-cpp.hpp>
     #include <mastodon-cpp/easy/easy.hpp>
-    #include <mastodon-cpp/easy/account.hpp>
-    #include <mastodon-cpp/easy/status.hpp>
+    #include <mastodon-cpp/easy/entities/account.hpp>
+    #include <mastodon-cpp/easy/entities/status.hpp>
 #endif
 
 using std::string;
diff --git a/src/easy/status.cpp b/src/easy/entities/status.cpp
similarity index 100%
rename from src/easy/status.cpp
rename to src/easy/entities/status.cpp
diff --git a/src/easy/status.hpp b/src/easy/entities/status.hpp
similarity index 89%
rename from src/easy/status.hpp
rename to src/easy/entities/status.hpp
index d31e78f..55eba8c 100644
--- a/src/easy/status.hpp
+++ b/src/easy/entities/status.hpp
@@ -26,21 +26,21 @@
 #ifdef MASTODON_CPP
     #include "mastodon-cpp.hpp"
     #include "easy/easy.hpp"
-    #include "easy/account.hpp"
-    #include "easy/emoji.hpp"
-    #include "easy/attachment.hpp"
-    #include "easy/mention.hpp"
-    #include "easy/tag.hpp"
-    #include "easy/application.hpp"
+    #include "easy/entities/account.hpp"
+    #include "easy/entities/emoji.hpp"
+    #include "easy/entities/attachment.hpp"
+    #include "easy/entities/mention.hpp"
+    #include "easy/entities/tag.hpp"
+    #include "easy/entities/application.hpp"
 #else
     #include <mastodon-cpp/mastodon-cpp.hpp>
     #include <mastodon-cpp/easy/easy.hpp>
-    #include <mastodon-cpp/easy/account.hpp>
-    #include <mastodon-cpp/easy/emoji.hpp>
-    #include <mastodon-cpp/easy/attachment.hpp>
-    #include <mastodon-cpp/easy/mention.hpp>
-    #include <mastodon-cpp/easy/tag.hpp>
-    #include <mastodon-cpp/easy/application.hpp>
+    #include <mastodon-cpp/easy/entities/account.hpp>
+    #include <mastodon-cpp/easy/entities/emoji.hpp>
+    #include <mastodon-cpp/easy/entities/attachment.hpp>
+    #include <mastodon-cpp/easy/entities/mention.hpp>
+    #include <mastodon-cpp/easy/entities/tag.hpp>
+    #include <mastodon-cpp/easy/entities/application.hpp>
 #endif
 
 using std::string;
diff --git a/src/easy/tag.cpp b/src/easy/entities/tag.cpp
similarity index 100%
rename from src/easy/tag.cpp
rename to src/easy/entities/tag.cpp
diff --git a/src/easy/tag.hpp b/src/easy/entities/tag.hpp
similarity index 100%
rename from src/easy/tag.hpp
rename to src/easy/entities/tag.hpp
diff --git a/tests/test_02_easy_get_public_timeline.cpp b/tests/test_02_easy_get_public_timeline.cpp
index 8da6c7d..46112c8 100644
--- a/tests/test_02_easy_get_public_timeline.cpp
+++ b/tests/test_02_easy_get_public_timeline.cpp
@@ -5,7 +5,7 @@
 #include <cstdint>
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
-#include "easy/status.hpp"
+#include "easy/entities/status.hpp"
 
 int main(int argc, char *argv[])
 {