diff --git a/spotipy/__init__.py b/spotipy/__init__.py
index d77e12a..4f3ddd4 100644
--- a/spotipy/__init__.py
+++ b/spotipy/__init__.py
@@ -1,2 +1 @@
-__all__ = ['spotipy']
-from spotipy import *
+from client import Spotify, SpotifyException
diff --git a/spotipy/spotipy.py b/spotipy/client.py
similarity index 99%
rename from spotipy/spotipy.py
rename to spotipy/client.py
index 6aa820a..3aeac95 100644
--- a/spotipy/spotipy.py
+++ b/spotipy/client.py
@@ -38,7 +38,9 @@ class Spotify(object):
             print(user)
     '''
 
-    trace = False
+    trace = False 
+    """enable tracing"""
+
     _auth = None
     
     def __init__(self, auth=None):