10 files changed, 17 insertions, 20 deletions
diff --git a/src/couch/__init__.py b/src/db/couch/__init__.py
index a7537bc..b099235 100644
--- a/src/couch/__init__.py
+++ b/src/db/couch/__init__.py
@@ -8,4 +8,4 @@ __email__ = "rinat.sabitov@gmail.com"
 __status__ = "Development"
 
 
-from couch.client import Server  # noqa: F401
+from db.couch.client import Server  # noqa: F401
diff --git a/src/couch/client.py b/src/db/couch/client.py
index 188e0de..73d85a1 100644
--- a/src/couch/client.py
+++ b/src/db/couch/client.py
@@ -1,18 +1,16 @@
 # -*- coding: utf-8 -*-
 # Based on py-couchdb (https://github.com/histrio/py-couchdb)
 
-import os
-import json
-import uuid
 import copy
+import json
 import mimetypes
+import os
+import uuid
 import warnings
 
-from couch import utils
-from couch import feedreader
-from couch import exceptions as exp
-from couch.resource import Resource
-
+from db.couch import exceptions as exp
+from db.couch import feedreader, utils
+from db.couch.resource import Resource
 
 DEFAULT_BASE_URL = os.environ.get('COUCHDB_URL', 'http://localhost:5984/')
 
diff --git a/src/couch/exceptions.py b/src/db/couch/exceptions.py
index d7e037b..d7e037b 100644
--- a/src/couch/exceptions.py
+++ b/src/db/couch/exceptions.py
diff --git a/src/couch/feedreader.py b/src/db/couch/feedreader.py
index e293932..e293932 100644
--- a/src/couch/feedreader.py
+++ b/src/db/couch/feedreader.py
diff --git a/src/couch/resource.py b/src/db/couch/resource.py
index da1e0dd..8ff883b 100644
--- a/src/couch/resource.py
+++ b/src/db/couch/resource.py
@@ -5,10 +5,9 @@
 from __future__ import unicode_literals
 
 import json
-import requests
 
-from couch import utils
-from couch import exceptions
+import requests
+from db.couch import exceptions, utils
 
 
 class Resource(object):
diff --git a/src/couch/utils.py b/src/db/couch/utils.py
index 1cd21d8..1cd21d8 100644
--- a/src/couch/utils.py
+++ b/src/db/couch/utils.py
diff --git a/src/db.py b/src/db/dictionary.py
index d186616..15f8f88 100755
--- a/src/db.py
+++ b/src/db/dictionary.py
@@ -11,8 +11,7 @@ import os
 import sys
 import time
 
-import couch
-import index
+from db import couch, index
 
 
 class DictDB():
diff --git a/src/index.py b/src/db/index.py
index 688ceeb..688ceeb 100644
--- a/src/index.py
+++ b/src/db/index.py
diff --git a/src/schema.py b/src/db/schema.py
index 37da5aa..37da5aa 100644
--- a/src/schema.py
+++ b/src/db/schema.py
diff --git a/src/main.py b/src/main.py
index fb359df..d3d02fd 100755
--- a/src/main.py
+++ b/src/main.py
@@ -1,16 +1,17 @@
 import os
 import sys
-import uvicorn
+import time
 
-from fastapi import FastAPI, Depends, Request
+import uvicorn
+from fastapi import Depends, FastAPI, Request
+from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
 from fastapi_jwt_auth import AuthJWT
 from fastapi_jwt_auth.exceptions import AuthJWTException
-from fastapi.middleware.cors import CORSMiddleware
 from pydantic import BaseModel
-from index import CouchIindex
-import time
-from db import DictDB
+
+from db.dictionary import DictDB
+from db.index import CouchIindex
 
 app = FastAPI()