diff --git a/cpp/alert.cpp b/include/cpp/alert.cpp
similarity index 100%
rename from cpp/alert.cpp
rename to include/cpp/alert.cpp
diff --git a/cpp/allocate_resources.cpp b/include/cpp/allocate_resources.cpp
similarity index 100%
rename from cpp/allocate_resources.cpp
rename to include/cpp/allocate_resources.cpp
diff --git a/cpp/bt_peer_connection.cpp b/include/cpp/bt_peer_connection.cpp
similarity index 100%
rename from cpp/bt_peer_connection.cpp
rename to include/cpp/bt_peer_connection.cpp
diff --git a/cpp/entry.cpp b/include/cpp/entry.cpp
similarity index 100%
rename from cpp/entry.cpp
rename to include/cpp/entry.cpp
diff --git a/cpp/escape_string.cpp b/include/cpp/escape_string.cpp
similarity index 100%
rename from cpp/escape_string.cpp
rename to include/cpp/escape_string.cpp
diff --git a/cpp/file.cpp b/include/cpp/file.cpp
similarity index 100%
rename from cpp/file.cpp
rename to include/cpp/file.cpp
diff --git a/cpp/http_tracker_connection.cpp b/include/cpp/http_tracker_connection.cpp
similarity index 100%
rename from cpp/http_tracker_connection.cpp
rename to include/cpp/http_tracker_connection.cpp
diff --git a/cpp/identify_client.cpp b/include/cpp/identify_client.cpp
similarity index 100%
rename from cpp/identify_client.cpp
rename to include/cpp/identify_client.cpp
diff --git a/cpp/ip_filter.cpp b/include/cpp/ip_filter.cpp
similarity index 100%
rename from cpp/ip_filter.cpp
rename to include/cpp/ip_filter.cpp
diff --git a/cpp/kademlia/closest_nodes.cpp b/include/cpp/kademlia/closest_nodes.cpp
similarity index 100%
rename from cpp/kademlia/closest_nodes.cpp
rename to include/cpp/kademlia/closest_nodes.cpp
diff --git a/cpp/kademlia/dht_tracker.cpp b/include/cpp/kademlia/dht_tracker.cpp
similarity index 100%
rename from cpp/kademlia/dht_tracker.cpp
rename to include/cpp/kademlia/dht_tracker.cpp
diff --git a/cpp/kademlia/find_data.cpp b/include/cpp/kademlia/find_data.cpp
similarity index 100%
rename from cpp/kademlia/find_data.cpp
rename to include/cpp/kademlia/find_data.cpp
diff --git a/cpp/kademlia/node.cpp b/include/cpp/kademlia/node.cpp
similarity index 100%
rename from cpp/kademlia/node.cpp
rename to include/cpp/kademlia/node.cpp
diff --git a/cpp/kademlia/node_id.cpp b/include/cpp/kademlia/node_id.cpp
similarity index 100%
rename from cpp/kademlia/node_id.cpp
rename to include/cpp/kademlia/node_id.cpp
diff --git a/cpp/kademlia/refresh.cpp b/include/cpp/kademlia/refresh.cpp
similarity index 100%
rename from cpp/kademlia/refresh.cpp
rename to include/cpp/kademlia/refresh.cpp
diff --git a/cpp/kademlia/routing_table.cpp b/include/cpp/kademlia/routing_table.cpp
similarity index 100%
rename from cpp/kademlia/routing_table.cpp
rename to include/cpp/kademlia/routing_table.cpp
diff --git a/cpp/kademlia/rpc_manager.cpp b/include/cpp/kademlia/rpc_manager.cpp
similarity index 100%
rename from cpp/kademlia/rpc_manager.cpp
rename to include/cpp/kademlia/rpc_manager.cpp
diff --git a/cpp/kademlia/traversal_algorithm.cpp b/include/cpp/kademlia/traversal_algorithm.cpp
similarity index 100%
rename from cpp/kademlia/traversal_algorithm.cpp
rename to include/cpp/kademlia/traversal_algorithm.cpp
diff --git a/cpp/peer_connection.cpp b/include/cpp/peer_connection.cpp
similarity index 100%
rename from cpp/peer_connection.cpp
rename to include/cpp/peer_connection.cpp
diff --git a/cpp/piece_picker.cpp b/include/cpp/piece_picker.cpp
similarity index 100%
rename from cpp/piece_picker.cpp
rename to include/cpp/piece_picker.cpp
diff --git a/cpp/policy.cpp b/include/cpp/policy.cpp
similarity index 100%
rename from cpp/policy.cpp
rename to include/cpp/policy.cpp
diff --git a/cpp/session.cpp b/include/cpp/session.cpp
similarity index 100%
rename from cpp/session.cpp
rename to include/cpp/session.cpp
diff --git a/cpp/session_impl.cpp b/include/cpp/session_impl.cpp
similarity index 100%
rename from cpp/session_impl.cpp
rename to include/cpp/session_impl.cpp
diff --git a/cpp/sha1.cpp b/include/cpp/sha1.cpp
similarity index 100%
rename from cpp/sha1.cpp
rename to include/cpp/sha1.cpp
diff --git a/cpp/stat.cpp b/include/cpp/stat.cpp
similarity index 100%
rename from cpp/stat.cpp
rename to include/cpp/stat.cpp
diff --git a/cpp/storage.cpp b/include/cpp/storage.cpp
similarity index 100%
rename from cpp/storage.cpp
rename to include/cpp/storage.cpp
diff --git a/cpp/torrent.cpp b/include/cpp/torrent.cpp
similarity index 100%
rename from cpp/torrent.cpp
rename to include/cpp/torrent.cpp
diff --git a/cpp/torrent_handle.cpp b/include/cpp/torrent_handle.cpp
similarity index 100%
rename from cpp/torrent_handle.cpp
rename to include/cpp/torrent_handle.cpp
diff --git a/cpp/torrent_info.cpp b/include/cpp/torrent_info.cpp
similarity index 100%
rename from cpp/torrent_info.cpp
rename to include/cpp/torrent_info.cpp
diff --git a/cpp/tracker_manager.cpp b/include/cpp/tracker_manager.cpp
similarity index 100%
rename from cpp/tracker_manager.cpp
rename to include/cpp/tracker_manager.cpp
diff --git a/cpp/udp_tracker_connection.cpp b/include/cpp/udp_tracker_connection.cpp
similarity index 100%
rename from cpp/udp_tracker_connection.cpp
rename to include/cpp/udp_tracker_connection.cpp
diff --git a/cpp/web_peer_connection.cpp b/include/cpp/web_peer_connection.cpp
similarity index 100%
rename from cpp/web_peer_connection.cpp
rename to include/cpp/web_peer_connection.cpp
diff --git a/setup.py b/setup.py
index 94650b822..bfc56f2d4 100644
--- a/setup.py
+++ b/setup.py
@@ -44,39 +44,39 @@ deluge_core = Extension('deluge_core',
 											'boost_program_options', 'boost_regex',
 											'boost_serialization', 'boost_thread', 'z', 'pthread'],
                     extra_compile_args = ["-Wno-missing-braces"],
-                    sources = ['cpp/alert.cpp',
-										 'cpp/allocate_resources.cpp',
-										 'cpp/bt_peer_connection.cpp',
-										 'cpp/entry.cpp',
-										 'cpp/escape_string.cpp',
-										 'cpp/file.cpp',
-										 'cpp/http_tracker_connection.cpp',
-					                	 'cpp/identify_client.cpp',
-										 'cpp/ip_filter.cpp',
- 										 'cpp/peer_connection.cpp',
-						             	 'cpp/piece_picker.cpp',     
-										 'cpp/policy.cpp',           
-										 'cpp/deluge_core.cpp',
-					                	 'cpp/session.cpp',   
-					                	 'cpp/session_impl.cpp',
-                               			 'cpp/sha1.cpp',
-									     'cpp/stat.cpp',
-									     'cpp/storage.cpp',
-								       	 'cpp/torrent.cpp',
-										 'cpp/torrent_handle.cpp',
-										 'cpp/torrent_info.cpp',
-										 'cpp/tracker_manager.cpp',
-										 'cpp/udp_tracker_connection.cpp',
-					                	 'cpp/web_peer_connection.cpp',
-										 'cpp/kademlia/closest_nodes.cpp',
-										 'cpp/kademlia/dht_tracker.cpp',
-										 'cpp/kademlia/find_data.cpp',
-										 'cpp/kademlia/node.cpp',
-										 'cpp/kademlia/node_id.cpp',
-										 'cpp/kademlia/refresh.cpp',
-										 'cpp/kademlia/routing_table.cpp',
-										 'cpp/kademlia/rpc_manager.cpp',
-										 'cpp/kademlia/traversal_algorithm.cpp'])
+                    sources = ['src/deluge_core.cpp',
+                    					 'include/cpp/alert.cpp',
+										 'include/cpp/allocate_resources.cpp',
+										 'include/cpp/bt_peer_connection.cpp',
+										 'include/cpp/entry.cpp',
+										 'include/cpp/escape_string.cpp',
+										 'include/cpp/file.cpp',
+										 'include/cpp/http_tracker_connection.cpp',
+					                	 'include/cpp/identify_client.cpp',
+										 'include/cpp/ip_filter.cpp',
+ 										 'include/cpp/peer_connection.cpp',
+						             	 'include/cpp/piece_picker.cpp',     
+										 'include/cpp/policy.cpp',       
+					                	 'include/cpp/session.cpp',   
+					                	 'include/cpp/session_impl.cpp',
+                               			 'include/cpp/sha1.cpp',
+									     'include/cpp/stat.cpp',
+									     'include/cpp/storage.cpp',
+								       	 'include/cpp/torrent.cpp',
+										 'include/cpp/torrent_handle.cpp',
+										 'include/cpp/torrent_info.cpp',
+										 'include/cpp/tracker_manager.cpp',
+										 'include/cpp/udp_tracker_connection.cpp',
+					                	 'include/cpp/web_peer_connection.cpp',
+										 'include/cpp/kademlia/closest_nodes.cpp',
+										 'include/cpp/kademlia/dht_tracker.cpp',
+										 'include/cpp/kademlia/find_data.cpp',
+										 'include/cpp/kademlia/node.cpp',
+										 'include/cpp/kademlia/node_id.cpp',
+										 'include/cpp/kademlia/refresh.cpp',
+										 'include/cpp/kademlia/routing_table.cpp',
+										 'include/cpp/kademlia/rpc_manager.cpp',
+										 'include/cpp/kademlia/traversal_algorithm.cpp'])
 
 
 setup(name="deluge", fullname="Deluge BitTorrent Client", version="0.5.0",
diff --git a/cpp/deluge_core.cpp b/src/deluge_core.cpp
similarity index 100%
rename from cpp/deluge_core.cpp
rename to src/deluge_core.cpp