diff --git a/greenmine/projects/serializers.py b/greenmine/projects/serializers.py
index 665d2731..6c41e9dc 100644
--- a/greenmine/projects/serializers.py
+++ b/greenmine/projects/serializers.py
@@ -19,16 +19,6 @@ class AttachmentSerializer(serializers.ModelSerializer):
                   "modified_date", "object_id", "url")
         read_only_fields = ("owner",)
 
-
-class ProjectSerializer(serializers.ModelSerializer):
-    tags = PickleField(required=False)
-    list_of_milestones = serializers.Field(source="list_of_milestones")
-
-    class Meta:
-        model = models.Project
-        read_only_fields = ("owner",)
-
-
 # User Stories common serializers
 
 class PointsSerializer(serializers.ModelSerializer):
@@ -75,3 +65,22 @@ class IssueTypeSerializer(serializers.ModelSerializer):
 class QuestionStatusSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.QuestionStatus
+
+
+# Projects
+
+class ProjectSerializer(serializers.ModelSerializer):
+    tags = PickleField(required=False)
+    list_of_milestones = serializers.Field(source="list_of_milestones")
+    us_statuses = UserStoryStatusSerializer(many=True)          # User Stories
+    points = PointsSerializer(many=True)
+    task_statuses = TaskStatusSerializer(many=True)             # Tasks
+    priorities = PrioritySerializer(many=True)                  # Issues
+    severities = SeveritySerializer(many=True)
+    issue_statuses = IssueStatusSerializer(many=True)
+    issue_types = IssueTypeSerializer(many=True)
+    #question_statuses = QuestionStatusSerializer(many=True)    # Questions
+
+    class Meta:
+        model = models.Project
+        read_only_fields = ("owner",)
diff --git a/greenmine/routers.py b/greenmine/routers.py
index c8d7dc4f..831b85d0 100644
--- a/greenmine/routers.py
+++ b/greenmine/routers.py
@@ -3,10 +3,7 @@
 from greenmine.base import routers
 from greenmine.base.users.api import AuthViewSet, RolesViewSet, UsersViewSet
 from greenmine.base.searches.api import SearchViewSet
-from greenmine.projects.api import (ProjectViewSet, PointsViewSet, UserStoryStatusViewSet,
-                                    TaskStatusViewSet,PriorityViewSet, SeverityViewSet,
-                                    IssueStatusViewSet, IssueTypeViewSet,
-                                    QuestionStatusViewSet, )
+from greenmine.projects.api import ProjectViewSet
 from greenmine.projects.milestones.api import MilestoneViewSet
 from greenmine.projects.userstories.api import UserStoryViewSet, UserStoryAttachmentViewSet
 from greenmine.projects.tasks.api import  TaskViewSet, TaskAttachmentViewSet
@@ -27,15 +24,6 @@ router.register(r"search", SearchViewSet, base_name="search")
 
 # greenmine.projects
 router.register(r"projects", ProjectViewSet, base_name="projects")
-router.register(r"points", PointsViewSet, base_name="points")
-router.register(r"userstory-statuses", UserStoryStatusViewSet,
-                base_name="userstory-statuses")
-router.register(r"task-statuses", TaskStatusViewSet, base_name="task-statuses")
-router.register(r"severities", SeverityViewSet, base_name="severities")
-router.register(r"priorities", PriorityViewSet, base_name="priorities")
-router.register(r"issue-statuses", IssueStatusViewSet, base_name="issue-statuses")
-router.register(r"issue-types", IssueTypeViewSet, base_name="issue-types")
-router.register(r"question-statuses", QuestionStatusViewSet, base_name="question-statuses")
 
 # greenmine.projects.milestones
 router.register(r"milestones", MilestoneViewSet, base_name="milestones")