14 files changed, 16 insertions, 2 deletions
diff --git a/synapse/client/__init__.py b/synapse/client/__init__.py
new file mode 100644
index 0000000000..1a84d94cd9
--- /dev/null
+++ b/synapse/client/__init__.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 OpenMarket Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
diff --git a/synapse/rest/__init__.py b/synapse/client/v1/__init__.py
index 88ec9cd27d..88ec9cd27d 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/client/v1/__init__.py
diff --git a/synapse/rest/admin.py b/synapse/client/v1/admin.py
index 0aa83514c8..0aa83514c8 100644
--- a/synapse/rest/admin.py
+++ b/synapse/client/v1/admin.py
diff --git a/synapse/rest/base.py b/synapse/client/v1/base.py
index c583945527..d005206b77 100644
--- a/synapse/rest/base.py
+++ b/synapse/client/v1/base.py
@@ -15,7 +15,7 @@
 
 """ This module contains base REST classes for constructing REST servlets. """
 from synapse.api.urls import CLIENT_PREFIX
-from synapse.rest.transactions import HttpTransactionStore
+from .transactions import HttpTransactionStore
 import re
 
 import logging
diff --git a/synapse/rest/directory.py b/synapse/client/v1/directory.py
index 7ff44fdd9e..7ff44fdd9e 100644
--- a/synapse/rest/directory.py
+++ b/synapse/client/v1/directory.py
diff --git a/synapse/rest/events.py b/synapse/client/v1/events.py
index bedcb2bcc6..c2515528ac 100644
--- a/synapse/rest/events.py
+++ b/synapse/client/v1/events.py
@@ -18,7 +18,7 @@ from twisted.internet import defer
 
 from synapse.api.errors import SynapseError
 from synapse.streams.config import PaginationConfig
-from synapse.rest.base import RestServlet, client_path_pattern
+from .base import RestServlet, client_path_pattern
 
 import logging
 
diff --git a/synapse/rest/initial_sync.py b/synapse/client/v1/initial_sync.py
index b13d56b286..b13d56b286 100644
--- a/synapse/rest/initial_sync.py
+++ b/synapse/client/v1/initial_sync.py
diff --git a/synapse/rest/login.py b/synapse/client/v1/login.py
index 6b8deff67b..6b8deff67b 100644
--- a/synapse/rest/login.py
+++ b/synapse/client/v1/login.py
diff --git a/synapse/rest/presence.py b/synapse/client/v1/presence.py
index ca4d2d21f0..ca4d2d21f0 100644
--- a/synapse/rest/presence.py
+++ b/synapse/client/v1/presence.py
diff --git a/synapse/rest/profile.py b/synapse/client/v1/profile.py
index dc6eb424b0..dc6eb424b0 100644
--- a/synapse/rest/profile.py
+++ b/synapse/client/v1/profile.py
diff --git a/synapse/rest/register.py b/synapse/client/v1/register.py
index e3b26902d9..e3b26902d9 100644
--- a/synapse/rest/register.py
+++ b/synapse/client/v1/register.py
diff --git a/synapse/rest/room.py b/synapse/client/v1/room.py
index 48bba2a5f3..48bba2a5f3 100644
--- a/synapse/rest/room.py
+++ b/synapse/client/v1/room.py
diff --git a/synapse/rest/transactions.py b/synapse/client/v1/transactions.py
index d933fea18a..d933fea18a 100644
--- a/synapse/rest/transactions.py
+++ b/synapse/client/v1/transactions.py
diff --git a/synapse/rest/voip.py b/synapse/client/v1/voip.py
index 011c35e69b..011c35e69b 100644
--- a/synapse/rest/voip.py
+++ b/synapse/client/v1/voip.py