Move API to project root

SatNOGS/api/serializers.py

@@ -16,7 +16,7 @@ class StationSerializer(serializers.ModelSerializer):
     class Meta:
         model = Station
         fields = ('owner', 'name', 'image', 'alt', 'lat', 'lng',
-                  'antenna', 'featured', 'featured_date')
+                  'antenna', 'featured_date', 'id')
 
     image = serializers.SerializerMethodField('image_url')
 

SatNOGS/api/urls.py

@@ -1,7 +1,7 @@
 from django.conf.urls import patterns, url, include
 from rest_framework import routers
 
-from base.api import views
+from api import views
 
 
 router = routers.DefaultRouter()

SatNOGS/api/views.py

@@ -1,6 +1,6 @@
 from rest_framework import viewsets
 
-from base.api import serializers
+from api import serializers
 from base.models import (Antenna, Data, Observation, Satellite, Station,
                          Transponder)
 

SatNOGS/urls.py

@@ -20,7 +20,7 @@ urlpatterns = patterns(
     url(r'^accounts/', include('allauth.urls')),
     url(r'^avatar/', include('avatar.urls')),
 
-    url(r'^api/', include('base.api.urls'))
+    url(r'^api/', include('api.urls'))
 )
 
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)