@@ -1,6 +1,16 @@
 {
     "authToken": "xxx",
     "secretKey": "xxx",
+    "twitter": {
+        "api": {
+            "key": "xxx",
+            "secret": "xxx"
+        },
+        "access": {
+            "token": "xxx",
+            "token-secret": "xxx"
+        }
+    },
     "tweetsFetchSettings": {
         "default": "live",
         "list": {
 
@@ -11,5 +11,7 @@
     config = json.load(f)
 
 tweetsFetchSettings = config['tweetsFetchSettings']['list'][config['tweetsFetchSettings']['default']]
+
 authToken = config['authToken']
 secretKey = config['secretKey']
+twitterAuth = config['twitter']
@@ -1,25 +1,18 @@
 from tweepy import AppAuthHandler, OAuthHandler, API
-from .shared import base_folder
+from .shared import base_folder, twitterAuth
 import json
 import os
 
-def read_auth_json():
-    ad = None
-    with open(os.path.join(base_folder, 'twitter-auth.json')) as json_file:
-        ad = json.load(json_file)
-    if ad is None:
-        raise Exception('Auth missing')
-    return ad
 
 def get_auth_app():
-    ad = read_auth_json()['api']
+    ad = twitterAuth['api']
     return AppAuthHandler(ad['key'], ad['secret'])
 
 def get_api_app():
     return API(get_auth_app())
 
 def get_auth_user():
-    ad = read_auth_json()
+    ad = twitterAuth
     auth = OAuthHandler(ad['api']['key'], ad['api']['secret'])
     auth.set_access_token(ad['access']['token'], ad['access']['token-secret'])
     return auth