diff --git a/greenmine/base/api.py b/greenmine/base/api.py
index 255bc264..6f4ea115 100644
--- a/greenmine/base/api.py
+++ b/greenmine/base/api.py
@@ -61,6 +61,12 @@ class RoleList(generics.ListCreateAPIView):
         return self.model.objects.all()
 
 
+class RoleDetail(generics.RetrieveAPIView):
+    model = Role
+    serializer_class = RoleSerializer
+    permission_classes = (IsAuthenticated,)
+
+
 #class UserFilter(django_filters.FilterSet):
 #    no_milestone = django_filters.NumberFilter(name="mileston", lookup_type='isnull')
 #
@@ -152,3 +158,6 @@ class Search(APIView):
 
         return Response({"detail": "Parameter text can't be empty"}, status.HTTP_400_BAD_REQUEST)
 
+
+
+
diff --git a/greenmine/base/urls.py b/greenmine/base/urls.py
index 43489811..42373ab5 100644
--- a/greenmine/base/urls.py
+++ b/greenmine/base/urls.py
@@ -10,7 +10,8 @@ urlpatterns = format_suffix_patterns(patterns('',
     url(r'^auth/logout/$', api.Logout.as_view(), name='logout'),
     url(r'^users/$', api.UserList.as_view(), name="user-list"),
     url(r'^users/(?P<pk>[0-9]+)/$', api.UserDetail.as_view(), name="user-detail"),
-    url(r'^roles/$', api.RoleList.as_view(), name="user-roles"),
+    url(r'^roles/$', api.RoleList.as_view(), name="roles"),
+    url(r'^roles/(?P<pk>[0-9]+)/$', api.RoleDetail.as_view(), name='role-detail'),
     url(r'^search/$', api.Search.as_view(), name="search"),
     url(r'^$', api.ApiRoot.as_view(), name='api_root'),
 ))
diff --git a/greenmine/scrum/api.py b/greenmine/scrum/api.py
index aa5647b1..a923528d 100644
--- a/greenmine/scrum/api.py
+++ b/greenmine/scrum/api.py
@@ -353,18 +353,3 @@ class PointsDetail(generics.RetrieveUpdateDestroyAPIView):
     model = Points
     serializer_class = PointsSerializer
     permission_classes = (IsAuthenticated, PointsDetailPermission,)
-
-
-class RoleList(generics.ListAPIView):
-    model = Role
-    serializer_class = RoleSerializer
-    permission_classes = (IsAuthenticated,)
-
-    def get_queryset(self):
-        return self.model.objects.all()
-
-
-class RoleDetail(generics.RetrieveAPIView):
-    model = Role
-    serializer_class = RoleSerializer
-    permission_classes = (IsAuthenticated,)
diff --git a/greenmine/scrum/urls.py b/greenmine/scrum/urls.py
index 8806e090..5c15cbc6 100644
--- a/greenmine/scrum/urls.py
+++ b/greenmine/scrum/urls.py
@@ -35,6 +35,4 @@ urlpatterns = format_suffix_patterns(patterns('',
     url(r'^tasks/statuses/(?P<pk>[0-9]+)/$', api.TaskStatusDetail.as_view(), name='tasks-status-detail'),
     url(r'^priorities/$', api.PriorityList.as_view(), name='priority-list'),
     url(r'^priorities/(?P<pk>[0-9]+)/$', api.PriorityDetail.as_view(), name='priority-detail'),
-    url(r'^roles/$', api.RoleList.as_view(), name='role-list'),
-    url(r'^roles/(?P<pk>[0-9]+)/$', api.RoleDetail.as_view(), name='role-detail'),
 ))