diff --git a/classes/Attention.php b/src/Entity/Attention.php
similarity index 100%
rename from classes/Attention.php
rename to src/Entity/Attention.php
diff --git a/classes/Avatar.php b/src/Entity/Avatar.php
similarity index 100%
rename from classes/Avatar.php
rename to src/Entity/Avatar.php
diff --git a/classes/Config.php b/src/Entity/Config.php
similarity index 100%
rename from classes/Config.php
rename to src/Entity/Config.php
diff --git a/classes/Confirm_address.php b/src/Entity/Confirm_address.php
similarity index 100%
rename from classes/Confirm_address.php
rename to src/Entity/Confirm_address.php
diff --git a/classes/Consumer.php b/src/Entity/Consumer.php
similarity index 100%
rename from classes/Consumer.php
rename to src/Entity/Consumer.php
diff --git a/classes/Conversation.php b/src/Entity/Conversation.php
similarity index 100%
rename from classes/Conversation.php
rename to src/Entity/Conversation.php
diff --git a/classes/File.php b/src/Entity/File.php
similarity index 100%
rename from classes/File.php
rename to src/Entity/File.php
diff --git a/classes/File_redirection.php b/src/Entity/File_redirection.php
similarity index 100%
rename from classes/File_redirection.php
rename to src/Entity/File_redirection.php
diff --git a/classes/File_thumbnail.php b/src/Entity/File_thumbnail.php
similarity index 100%
rename from classes/File_thumbnail.php
rename to src/Entity/File_thumbnail.php
diff --git a/classes/File_to_post.php b/src/Entity/File_to_post.php
similarity index 100%
rename from classes/File_to_post.php
rename to src/Entity/File_to_post.php
diff --git a/classes/Foreign_link.php b/src/Entity/Foreign_link.php
similarity index 100%
rename from classes/Foreign_link.php
rename to src/Entity/Foreign_link.php
diff --git a/classes/Foreign_service.php b/src/Entity/Foreign_service.php
similarity index 100%
rename from classes/Foreign_service.php
rename to src/Entity/Foreign_service.php
diff --git a/classes/Foreign_subscription.php b/src/Entity/Foreign_subscription.php
similarity index 100%
rename from classes/Foreign_subscription.php
rename to src/Entity/Foreign_subscription.php
diff --git a/classes/Foreign_user.php b/src/Entity/Foreign_user.php
similarity index 100%
rename from classes/Foreign_user.php
rename to src/Entity/Foreign_user.php
diff --git a/classes/GS_DataObject.php b/src/Entity/GS_DataObject.php
similarity index 100%
rename from classes/GS_DataObject.php
rename to src/Entity/GS_DataObject.php
diff --git a/classes/Group_alias.php b/src/Entity/Group_alias.php
similarity index 100%
rename from classes/Group_alias.php
rename to src/Entity/Group_alias.php
diff --git a/classes/Group_block.php b/src/Entity/Group_block.php
similarity index 100%
rename from classes/Group_block.php
rename to src/Entity/Group_block.php
diff --git a/classes/Group_inbox.php b/src/Entity/Group_inbox.php
similarity index 100%
rename from classes/Group_inbox.php
rename to src/Entity/Group_inbox.php
diff --git a/classes/Group_join_queue.php b/src/Entity/Group_join_queue.php
similarity index 100%
rename from classes/Group_join_queue.php
rename to src/Entity/Group_join_queue.php
diff --git a/classes/Group_member.php b/src/Entity/Group_member.php
similarity index 100%
rename from classes/Group_member.php
rename to src/Entity/Group_member.php
diff --git a/classes/Invitation.php b/src/Entity/Invitation.php
similarity index 100%
rename from classes/Invitation.php
rename to src/Entity/Invitation.php
diff --git a/classes/Local_group.php b/src/Entity/Local_group.php
similarity index 100%
rename from classes/Local_group.php
rename to src/Entity/Local_group.php
diff --git a/classes/Location_namespace.php b/src/Entity/Location_namespace.php
similarity index 100%
rename from classes/Location_namespace.php
rename to src/Entity/Location_namespace.php
diff --git a/classes/Login_token.php b/src/Entity/Login_token.php
similarity index 100%
rename from classes/Login_token.php
rename to src/Entity/Login_token.php
diff --git a/classes/Managed_DataObject.php b/src/Entity/Managed_DataObject.php
similarity index 100%
rename from classes/Managed_DataObject.php
rename to src/Entity/Managed_DataObject.php
diff --git a/classes/Memcached_DataObject.php b/src/Entity/Memcached_DataObject.php
similarity index 100%
rename from classes/Memcached_DataObject.php
rename to src/Entity/Memcached_DataObject.php
diff --git a/classes/Nonce.php b/src/Entity/Nonce.php
similarity index 100%
rename from classes/Nonce.php
rename to src/Entity/Nonce.php
diff --git a/classes/Notice.php b/src/Entity/Notice.php
similarity index 100%
rename from classes/Notice.php
rename to src/Entity/Notice.php
diff --git a/classes/Notice_location.php b/src/Entity/Notice_location.php
similarity index 100%
rename from classes/Notice_location.php
rename to src/Entity/Notice_location.php
diff --git a/classes/Notice_prefs.php b/src/Entity/Notice_prefs.php
similarity index 100%
rename from classes/Notice_prefs.php
rename to src/Entity/Notice_prefs.php
diff --git a/classes/Notice_source.php b/src/Entity/Notice_source.php
similarity index 100%
rename from classes/Notice_source.php
rename to src/Entity/Notice_source.php
diff --git a/classes/Notice_tag.php b/src/Entity/Notice_tag.php
similarity index 100%
rename from classes/Notice_tag.php
rename to src/Entity/Notice_tag.php
diff --git a/classes/Oauth_application.php b/src/Entity/Oauth_application.php
similarity index 100%
rename from classes/Oauth_application.php
rename to src/Entity/Oauth_application.php
diff --git a/classes/Oauth_application_user.php b/src/Entity/Oauth_application_user.php
similarity index 100%
rename from classes/Oauth_application_user.php
rename to src/Entity/Oauth_application_user.php
diff --git a/classes/Oauth_token_association.php b/src/Entity/Oauth_token_association.php
similarity index 100%
rename from classes/Oauth_token_association.php
rename to src/Entity/Oauth_token_association.php
diff --git a/classes/Old_school_prefs.php b/src/Entity/Old_school_prefs.php
similarity index 100%
rename from classes/Old_school_prefs.php
rename to src/Entity/Old_school_prefs.php
diff --git a/classes/Profile.php b/src/Entity/Profile.php
similarity index 100%
rename from classes/Profile.php
rename to src/Entity/Profile.php
diff --git a/classes/Profile_block.php b/src/Entity/Profile_block.php
similarity index 100%
rename from classes/Profile_block.php
rename to src/Entity/Profile_block.php
diff --git a/classes/Profile_list.php b/src/Entity/Profile_list.php
similarity index 100%
rename from classes/Profile_list.php
rename to src/Entity/Profile_list.php
diff --git a/classes/Profile_prefs.php b/src/Entity/Profile_prefs.php
similarity index 100%
rename from classes/Profile_prefs.php
rename to src/Entity/Profile_prefs.php
diff --git a/classes/Profile_role.php b/src/Entity/Profile_role.php
similarity index 100%
rename from classes/Profile_role.php
rename to src/Entity/Profile_role.php
diff --git a/classes/Profile_tag.php b/src/Entity/Profile_tag.php
similarity index 100%
rename from classes/Profile_tag.php
rename to src/Entity/Profile_tag.php
diff --git a/classes/Profile_tag_subscription.php b/src/Entity/Profile_tag_subscription.php
similarity index 100%
rename from classes/Profile_tag_subscription.php
rename to src/Entity/Profile_tag_subscription.php
diff --git a/classes/Queue_item.php b/src/Entity/Queue_item.php
similarity index 100%
rename from classes/Queue_item.php
rename to src/Entity/Queue_item.php
diff --git a/classes/Related_group.php b/src/Entity/Related_group.php
similarity index 100%
rename from classes/Related_group.php
rename to src/Entity/Related_group.php
diff --git a/classes/Remember_me.php b/src/Entity/Remember_me.php
similarity index 100%
rename from classes/Remember_me.php
rename to src/Entity/Remember_me.php
diff --git a/classes/Reply.php b/src/Entity/Reply.php
similarity index 100%
rename from classes/Reply.php
rename to src/Entity/Reply.php
diff --git a/classes/Safe_DataObject.php b/src/Entity/Safe_DataObject.php
similarity index 100%
rename from classes/Safe_DataObject.php
rename to src/Entity/Safe_DataObject.php
diff --git a/classes/Schema_version.php b/src/Entity/Schema_version.php
similarity index 100%
rename from classes/Schema_version.php
rename to src/Entity/Schema_version.php
diff --git a/classes/Session.php b/src/Entity/Session.php
similarity index 100%
rename from classes/Session.php
rename to src/Entity/Session.php
diff --git a/classes/Sms_carrier.php b/src/Entity/Sms_carrier.php
similarity index 100%
rename from classes/Sms_carrier.php
rename to src/Entity/Sms_carrier.php
diff --git a/classes/Status_network.php b/src/Entity/Status_network.php
similarity index 100%
rename from classes/Status_network.php
rename to src/Entity/Status_network.php
diff --git a/classes/Status_network_tag.php b/src/Entity/Status_network_tag.php
similarity index 100%
rename from classes/Status_network_tag.php
rename to src/Entity/Status_network_tag.php
diff --git a/classes/Subscription.php b/src/Entity/Subscription.php
similarity index 100%
rename from classes/Subscription.php
rename to src/Entity/Subscription.php
diff --git a/classes/Subscription_queue.php b/src/Entity/Subscription_queue.php
similarity index 100%
rename from classes/Subscription_queue.php
rename to src/Entity/Subscription_queue.php
diff --git a/classes/Token.php b/src/Entity/Token.php
similarity index 100%
rename from classes/Token.php
rename to src/Entity/Token.php
diff --git a/classes/Unavailable_status_network.php b/src/Entity/Unavailable_status_network.php
similarity index 100%
rename from classes/Unavailable_status_network.php
rename to src/Entity/Unavailable_status_network.php
diff --git a/classes/User.php b/src/Entity/User.php
similarity index 100%
rename from classes/User.php
rename to src/Entity/User.php
diff --git a/classes/User_group.php b/src/Entity/User_group.php
similarity index 100%
rename from classes/User_group.php
rename to src/Entity/User_group.php
diff --git a/classes/User_im_prefs.php b/src/Entity/User_im_prefs.php
similarity index 100%
rename from classes/User_im_prefs.php
rename to src/Entity/User_im_prefs.php
diff --git a/classes/User_location_prefs.php b/src/Entity/User_location_prefs.php
similarity index 100%
rename from classes/User_location_prefs.php
rename to src/Entity/User_location_prefs.php
diff --git a/classes/User_urlshortener_prefs.php b/src/Entity/User_urlshortener_prefs.php
similarity index 100%
rename from classes/User_urlshortener_prefs.php
rename to src/Entity/User_urlshortener_prefs.php
diff --git a/classes/User_username.php b/src/Entity/User_username.php
similarity index 100%
rename from classes/User_username.php
rename to src/Entity/User_username.php
diff --git a/classes/status_network.ini b/src/Entity/status_network.ini
similarity index 100%
rename from classes/status_network.ini
rename to src/Entity/status_network.ini