diff --git a/nop/templates/nop/nop_form.html b/nop/templates/nop_form.html
similarity index 100%
rename from nop/templates/nop/nop_form.html
rename to nop/templates/nop_form.html
diff --git a/nop/views.py b/nop/views.py
index a106493b2f6b580f935fed9da4c63bf669be7255..1faf7f409becf08c4095927349834b4c7041cee6 100644
--- a/nop/views.py
+++ b/nop/views.py
@@ -82,4 +82,4 @@ def nop_form(request):
     result = _bydate(date.year, date.month, date.day, time.hour, time.minute)
     context['nowplaying'] = result
     context['form'] = form
-    return render_to_response('nop/nop_form.html', context)
+    return render_to_response('nop_form.html', context)