Rename 'internal' dir to 'synapse'

We needed to switch the admin import as else it tries to import relatively, and
we end up importing the wrong module.

synapse/app/homeserver.py

@@ -211,7 +211,7 @@ def _configure_named_resource(self, name, compress=False):
                 resources["/_matrix/saml2"] = SAML2Resource(self)
 
             if self.get_config().threepid_behaviour_email == ThreepidBehaviour.LOCAL:
-                from synapse.rest.internal.client.password_reset import (
+                from synapse.rest.synapse.client.password_reset import (
                     PasswordResetSubmitTokenResource,
                 )
 

synapse/rest/__init__.py

@@ -13,8 +13,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import synapse.rest.admin
 from synapse.http.server import JsonResource
+from synapse.rest import admin
 from synapse.rest.client import versions
 from synapse.rest.client.v1 import (
     directory,
@@ -123,9 +123,7 @@ def register_servlets(client_resource, hs):
         password_policy.register_servlets(hs, client_resource)
 
         # moving to /_synapse/admin
-        synapse.rest.admin.register_servlets_for_client_rest_resource(
-            hs, client_resource
-        )
+        admin.register_servlets_for_client_rest_resource(hs, client_resource)
 
         # unstable
         shared_rooms.register_servlets(hs, client_resource)

tests/rest/client/v2_alpha/test_account.py

@@ -28,7 +28,7 @@
 from synapse.api.errors import Codes
 from synapse.rest.client.v1 import login, room
 from synapse.rest.client.v2_alpha import account, register
-from synapse.rest.internal.client.password_reset import PasswordResetSubmitTokenResource
+from synapse.rest.synapse.client.password_reset import PasswordResetSubmitTokenResource
 
 from tests import unittest
 from tests.unittest import override_config