diff --git a/api/api.py b/api/api.py
index 3a88fc3..8703d27 100644
--- a/api/api.py
+++ b/api/api.py
@@ -1,31 +1,18 @@
 from flask import Blueprint, request, jsonify, session
-from .users.user_endpoint import UserEndpoint
-from .users.room_endpoint import RoomEndpoint
+from .users.api_users import api_users
+from .rooms.api_rooms import api_rooms
 
 api = Blueprint('api', __name__, url_prefix='/api')
 
+def register_api_endpoints(app):
+    app.register_blueprint(api_users)
+    app.register_blueprint(api_rooms)
+    app.register_blueprint(api)
+    return app
+
 @api.route('/home', methods=['GET'])
 def api_home():
     response = {"message": "home page"}
     return jsonify(response)
 
-@api.route('/users', methods=['GET'])
-def api_get_users():
-    return jsonify(UserEndpoint.users())
 
-@api.route('/user', methods=['GET'])
-def api_get_user():
-    return jsonify(UserEndpoint.user())
-
-@api.route('/rooms', methods=['GET'])
-def api_get_rooms():
-    return RoomEndpoint.get_rooms()
-
-@api.route('/room', methods=['GET'])
-def api_get_room():
-    return RoomEndpoint.get_room()
-
-# protected route
-@api.route('/room', methods=['POST'])
-def api_post_room():
-    return pass
\ No newline at end of file
diff --git a/api/rooms/api_rooms.py b/api/rooms/api_rooms.py
new file mode 100644
index 0000000..19c3346
--- /dev/null
+++ b/api/rooms/api_rooms.py
@@ -0,0 +1,19 @@
+from models.User import User, user_schema, users_schema
+from models.GameRoom import GameRoom
+from flask import Blueprint, request, jsonify, session
+
+api_rooms = Blueprint('api_rooms', __name__, url_prefix='/api/rooms')
+
+@api_rooms.route('/<id>', methods=['GET'])
+def get_room():
+    pass
+
+@api_rooms.route('/', methods=['GET'])
+def get_rooms():
+    response = {"status" : "success"}
+    return jsonify(response)
+
+# protected route
+@api_rooms.route('/', methods=['POST'])
+def post_room():
+    pass
\ No newline at end of file
diff --git a/api/rooms/room_endpoint.py b/api/rooms/room_endpoint.py
deleted file mode 100644
index 5ba537d..0000000
--- a/api/rooms/room_endpoint.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from models.User import User, user_schema, users_schema
-from models.Room import Room
-from flask import request, jsonify, Response, json
-
-class RoomEndpoint(object):
-    def get_rooms():
-        pass
-    def get_room():
-        pass
\ No newline at end of file
diff --git a/api/users/api_users.py b/api/users/api_users.py
new file mode 100644
index 0000000..e6d4183
--- /dev/null
+++ b/api/users/api_users.py
@@ -0,0 +1,25 @@
+from models.User import User, user_schema, users_schema
+from flask import Blueprint, request, json, session, jsonify
+
+api_users = Blueprint('api_users', __name__, url_prefix='/api')
+
+@api_users.route('/users/', methods=['GET'])
+def api_get_users():
+    print('called one')
+    users = User.query.all()
+    response = users_schema.dumps(users)
+    return jsonify(response)
+
+@api_users.route('/users/account', methods=['GET'])
+def api_get_user():
+    print('called')
+    auth_header = request.headers.get('Authorization') or None
+    if auth_header:
+        auth_token = auth_header.split(" ")[1]
+        user = User.decode_auth_token(auth_token) or None
+        response = json.dumps(user)
+    else: 
+        response = {
+            'status': 'failed',
+            'message': 'Please Log In'}
+    return jsonify(response)
diff --git a/api/users/user_endpoint.py b/api/users/user_endpoint.py
deleted file mode 100644
index c5413ab..0000000
--- a/api/users/user_endpoint.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from models.User import User, user_schema, users_schema
-from flask import request, jsonify, Response, json
-
-class UserEndpoint(object):
-    def users():
-        users = User.query.all()
-        response = users_schema.dumps(users)
-        return response
-    def user():
-
-        auth_header = request.headers.get('Authorization') or None
-        auth_token = auth_header.split(" ")[1]
-        user = User.decode_auth_token(auth_token) or None
-        response = json.dumps(user)
-        return response
\ No newline at end of file
diff --git a/server.py b/server.py
index bebf6c1..226bf96 100644
--- a/server.py
+++ b/server.py
@@ -1,7 +1,7 @@
 from app import create_app, db
 
 # Blueprints
-from api.api import api
+from api.api import register_api_endpoints
 from auth.auth import auth
 
 # Web sockets
@@ -14,7 +14,6 @@ from flask_migrate import Migrate
 
 if __name__ == '__main__':
     app = create_app()
-    app.register_blueprint(api)
-    app.register_blueprint(auth)
+    register_api_endpoints(app)
     migrate = Migrate(app, db)
     socketio.run(app, debug=True)
\ No newline at end of file