diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c21954..9378459 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,24 +1,23 @@
 set (HEADERS
-  Audio.h
-  Document.h
-  json_encode.h
-  PhotoSize.h
-  User.h
-  Chat.h
-  exec.h
-  Location.h
-  std.h
-  Venue.h
-  Contact.h
-  explode.h
-  MessageEntity.h
-  Sticker.h
-  Video.h
-  defines.h
-  http_build_query.h
-  Message.h
-  TelegramBot.h
-  Voice.h
+  include/Audio.h
+  include/Document.h
+  include/json_encode.h
+  include/PhotoSize.h
+  include/User.h
+  include/Chat.h
+  include/exec.h
+  include/Location.h
+  include/std.h
+  include/Venue.h
+  include/Contact.h
+  include/explode.h
+  include/MessageEntity.h
+  include/Sticker.h
+  include/Video.h
+  include/http_build_query.h
+  include/Message.h
+  include/TelegramBot.h
+  include/Voice.h
 )
 
 set (SOURCES
diff --git a/include/Audio.h b/include/Telegram/Audio.h
similarity index 100%
rename from include/Audio.h
rename to include/Telegram/Audio.h
diff --git a/include/Chat.h b/include/Telegram/Chat.h
similarity index 100%
rename from include/Chat.h
rename to include/Telegram/Chat.h
diff --git a/include/Contact.h b/include/Telegram/Contact.h
similarity index 100%
rename from include/Contact.h
rename to include/Telegram/Contact.h
diff --git a/include/Document.h b/include/Telegram/Document.h
similarity index 91%
rename from include/Document.h
rename to include/Telegram/Document.h
index d5a1271..6b64498 100644
--- a/include/Document.h
+++ b/include/Telegram/Document.h
@@ -4,7 +4,7 @@
 #include <json/json.h>
 #include <string>
 
-#include "PhotoSize.h"
+#include <Telegram/PhotoSize.h>
 
 namespace Telegram {
 
diff --git a/include/Location.h b/include/Telegram/Location.h
similarity index 100%
rename from include/Location.h
rename to include/Telegram/Location.h
diff --git a/include/Message.h b/include/Telegram/Message.h
similarity index 79%
rename from include/Message.h
rename to include/Telegram/Message.h
index 6d31ef2..86757d8 100644
--- a/include/Message.h
+++ b/include/Telegram/Message.h
@@ -6,18 +6,18 @@
 #include <string>
 #include <vector>
 
-#include "Audio.h"
-#include "Chat.h"
-#include "Contact.h"
-#include "Document.h"
-#include "Location.h"
-#include "MessageEntity.h"
-#include "PhotoSize.h"
-#include "Sticker.h"
-#include "User.h"
-#include "Venue.h"
-#include "Video.h"
-#include "Voice.h"
+#include <Telegram/Audio.h>
+#include <Telegram/Chat.h>
+#include <Telegram/Contact.h>
+#include <Telegram/Document.h>
+#include <Telegram/Location.h>
+#include <Telegram/MessageEntity.h>
+#include <Telegram/PhotoSize.h>
+#include <Telegram/Sticker.h>
+#include <Telegram/User.h>
+#include <Telegram/Venue.h>
+#include <Telegram/Video.h>
+#include <Telegram/Voice.h>
 
 namespace Telegram {
 
diff --git a/include/MessageEntity.h b/include/Telegram/MessageEntity.h
similarity index 100%
rename from include/MessageEntity.h
rename to include/Telegram/MessageEntity.h
diff --git a/include/PhotoSize.h b/include/Telegram/PhotoSize.h
similarity index 100%
rename from include/PhotoSize.h
rename to include/Telegram/PhotoSize.h
diff --git a/include/Sticker.h b/include/Telegram/Sticker.h
similarity index 90%
rename from include/Sticker.h
rename to include/Telegram/Sticker.h
index da6d17c..9098bde 100644
--- a/include/Sticker.h
+++ b/include/Telegram/Sticker.h
@@ -4,7 +4,7 @@
 #include <json/json.h>
 #include <string>
 
-#include "PhotoSize.h"
+#include <Telegram/PhotoSize.h>
 
 namespace Telegram {
 
diff --git a/include/TelegramBot.h b/include/Telegram/TelegramBot.h
similarity index 97%
rename from include/TelegramBot.h
rename to include/Telegram/TelegramBot.h
index e285943..98f721c 100644
--- a/include/TelegramBot.h
+++ b/include/Telegram/TelegramBot.h
@@ -7,7 +7,7 @@
 #include <curl/curl.h>
 #include <json/json.h>
 
-#include "Message.h"
+#include <Telegram/Message.h>
 
 namespace Telegram {
 
diff --git a/include/User.h b/include/Telegram/User.h
similarity index 100%
rename from include/User.h
rename to include/Telegram/User.h
diff --git a/include/Venue.h b/include/Telegram/Venue.h
similarity index 89%
rename from include/Venue.h
rename to include/Telegram/Venue.h
index c2ef36f..8401bd0 100644
--- a/include/Venue.h
+++ b/include/Telegram/Venue.h
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "Location.h"
+#include <Telegram/Location.h>
 
 namespace Telegram {
 
diff --git a/include/Video.h b/include/Telegram/Video.h
similarity index 91%
rename from include/Video.h
rename to include/Telegram/Video.h
index 95401a4..c7563ed 100644
--- a/include/Video.h
+++ b/include/Telegram/Video.h
@@ -4,7 +4,7 @@
 #include <json/json.h>
 #include <string>
 
-#include "PhotoSize.h"
+#include <Telegram/PhotoSize.h>
 
 namespace Telegram {
 
diff --git a/include/Voice.h b/include/Telegram/Voice.h
similarity index 100%
rename from include/Voice.h
rename to include/Telegram/Voice.h
diff --git a/include/exec.h b/include/Telegram/exec.h
similarity index 100%
rename from include/exec.h
rename to include/Telegram/exec.h
diff --git a/include/explode.h b/include/Telegram/explode.h
similarity index 100%
rename from include/explode.h
rename to include/Telegram/explode.h
diff --git a/include/http_build_query.h b/include/Telegram/http_build_query.h
similarity index 100%
rename from include/http_build_query.h
rename to include/Telegram/http_build_query.h
diff --git a/include/json_encode.h b/include/Telegram/json_encode.h
similarity index 100%
rename from include/json_encode.h
rename to include/Telegram/json_encode.h
diff --git a/include/std.h b/include/Telegram/std.h
similarity index 100%
rename from include/std.h
rename to include/Telegram/std.h
diff --git a/src/Audio.cc b/src/Audio.cc
index 7cf1013..d599047 100644
--- a/src/Audio.cc
+++ b/src/Audio.cc
@@ -1,4 +1,4 @@
-#include "Audio.h"
+#include "Telegram/Audio.h"
 
 Telegram::Audio::Audio(Json::Value json) {
 
diff --git a/src/Chat.cc b/src/Chat.cc
index 8541d1e..49edec2 100644
--- a/src/Chat.cc
+++ b/src/Chat.cc
@@ -1,4 +1,4 @@
-#include "Chat.h"
+#include "Telegram/Chat.h"
 
 Telegram::Chat::Chat(Json::Value json) {
 
diff --git a/src/Contact.cc b/src/Contact.cc
index 86cd5dd..b864897 100644
--- a/src/Contact.cc
+++ b/src/Contact.cc
@@ -1,4 +1,4 @@
-#include "Contact.h"
+#include "Telegram/Contact.h"
 
 Telegram::Contact::Contact(Json::Value json) {
 
diff --git a/src/Document.cc b/src/Document.cc
index f55823b..f3730cd 100644
--- a/src/Document.cc
+++ b/src/Document.cc
@@ -1,4 +1,4 @@
-#include "Document.h"
+#include "Telegram/Document.h"
 
 Telegram::Document::Document(Json::Value json) {
 
diff --git a/src/Location.cc b/src/Location.cc
index 5db5f5e..839eabb 100644
--- a/src/Location.cc
+++ b/src/Location.cc
@@ -1,4 +1,4 @@
-#include "Location.h"
+#include "Telegram/Location.h"
 
 Telegram::Location::Location(Json::Value json) {
 
diff --git a/src/Message.cc b/src/Message.cc
index e565a00..cc0c51b 100644
--- a/src/Message.cc
+++ b/src/Message.cc
@@ -1,4 +1,4 @@
-#include "Message.h"
+#include "Telegram/Message.h"
 
 // Generic constructor
 // @TODO: Make this an "init"-Method and call it from the constructor
diff --git a/src/MessageEntity.cc b/src/MessageEntity.cc
index d903a5b..4da3263 100644
--- a/src/MessageEntity.cc
+++ b/src/MessageEntity.cc
@@ -1,4 +1,4 @@
-#include "MessageEntity.h"
+#include "Telegram/MessageEntity.h"
 
 Telegram::MessageEntity::MessageEntity(Json::Value json) {
 
diff --git a/src/PhotoSize.cc b/src/PhotoSize.cc
index a110d1a..09f5b89 100644
--- a/src/PhotoSize.cc
+++ b/src/PhotoSize.cc
@@ -1,4 +1,4 @@
-#include "PhotoSize.h"
+#include "Telegram/PhotoSize.h"
 
 Telegram::PhotoSize::PhotoSize(Json::Value json) {
 
diff --git a/src/Sticker.cc b/src/Sticker.cc
index b78aab2..5bb08f5 100644
--- a/src/Sticker.cc
+++ b/src/Sticker.cc
@@ -1,4 +1,4 @@
-#include "Sticker.h"
+#include "Telegram/Sticker.h"
 
 Telegram::Sticker::Sticker(Json::Value json) {
 
diff --git a/src/TelegramBot.cc b/src/TelegramBot.cc
index ec19a3a..e919c19 100644
--- a/src/TelegramBot.cc
+++ b/src/TelegramBot.cc
@@ -1,4 +1,4 @@
-#include "TelegramBot.h"
+#include "Telegram/TelegramBot.h"
 
 #include <iostream>
 
@@ -7,12 +7,12 @@
 #include <curlpp/Infos.hpp>
 #include <curlpp/Options.hpp>
 
-#include "http_build_query.h"
-#include "json_encode.h"
-#include "std.h"
+#include "Telegram/http_build_query.h"
+#include "Telegram/json_encode.h"
+#include "Telegram/std.h"
 
-#include "Message.h"
-#include "MessageEntity.h"
+#include "Telegram/Message.h"
+#include "Telegram/MessageEntity.h"
 
 #define API_URL "https://api.telegram.org/bot"
 
diff --git a/src/User.cc b/src/User.cc
index 3511782..e1ede50 100644
--- a/src/User.cc
+++ b/src/User.cc
@@ -1,4 +1,4 @@
-#include "User.h"
+#include "Telegram/User.h"
 
 Telegram::User::User(Json::Value json) {
 
diff --git a/src/Venue.cc b/src/Venue.cc
index 6517e8a..a6d0ec6 100644
--- a/src/Venue.cc
+++ b/src/Venue.cc
@@ -1,4 +1,4 @@
-#include "Venue.h"
+#include "Telegram/Venue.h"
 
 Telegram::Venue::Venue(Json::Value json) {
 
diff --git a/src/Video.cc b/src/Video.cc
index cd3fcfa..50b9655 100644
--- a/src/Video.cc
+++ b/src/Video.cc
@@ -1,4 +1,4 @@
-#include "Video.h"
+#include "Telegram/Video.h"
 
 Telegram::Video::Video(Json::Value json) {
 
diff --git a/src/Voice.cc b/src/Voice.cc
index 0560b81..3db8670 100644
--- a/src/Voice.cc
+++ b/src/Voice.cc
@@ -1,4 +1,4 @@
-#include "Voice.h"
+#include "Telegram/Voice.h"
 
 Telegram::Voice::Voice(Json::Value json) {
 
diff --git a/src/exec.cc b/src/exec.cc
index 4faad42..3b94c47 100644
--- a/src/exec.cc
+++ b/src/exec.cc
@@ -1,4 +1,4 @@
-#include "exec.h"
+#include "Telegram/exec.h"
 
 #include <iostream>
 #include <stdio.h>
diff --git a/src/explode.cc b/src/explode.cc
index 009b5ec..7477e5d 100644
--- a/src/explode.cc
+++ b/src/explode.cc
@@ -1,4 +1,4 @@
-#include "explode.h"
+#include "Telegram/explode.h"
 
 std::vector<std::string> explode( const std::string &delimiter, const std::string &str) {
 
diff --git a/src/http_build_query.cc b/src/http_build_query.cc
index 51ed26b..31ce252 100644
--- a/src/http_build_query.cc
+++ b/src/http_build_query.cc
@@ -1,4 +1,4 @@
-#include "http_build_query.h"
+#include "Telegram/http_build_query.h"
 
 std::string http_build_query(std::map<std::string, std::string> data) {
 
diff --git a/src/json_encode.cc b/src/json_encode.cc
index 2b12a9f..c89d0ed 100644
--- a/src/json_encode.cc
+++ b/src/json_encode.cc
@@ -1,4 +1,4 @@
-#include "json_encode.h"
+#include "Telegram/json_encode.h"
 
 std::string json_encode(std::map<std::string, std::string> parameters) {
 
diff --git a/src/std.cc b/src/std.cc
index 7a94401..22aaba7 100644
--- a/src/std.cc
+++ b/src/std.cc
@@ -1,4 +1,4 @@
-#include "std.h"
+#include "Telegram/std.h"
 
 #include <pwd.h>
 #include <time.h>