diff --git a/attract/application/modules/shots/__init__.py b/attract/application/modules/shots/__init__.py
index a4d0d95c..7984bd3d 100644
--- a/attract/application/modules/shots/__init__.py
+++ b/attract/application/modules/shots/__init__.py
@@ -10,17 +10,9 @@ from flask.ext.thumbnails import Thumbnail
 from flask.ext.sqlalchemy import SQLAlchemy
 from sqlalchemy.orm import aliased
 
-from flask_wtf import Form
-from wtforms import TextField
-from wtforms import BooleanField
-from wtforms import SelectField
-from wtforms import TextAreaField
-from wtforms import IntegerField
-
-from wtforms.validators import DataRequired
-
 from application import db
 
+from application.modules.shots.forms import ShotForm
 from application.modules.nodes.models import Node, NodeType, Status
 from application.modules.shots.models import NodeShot
 
@@ -61,14 +53,6 @@ def view(shot_id):
         abort(404)
 
 
-class ShotForm(Form):
-    name = TextField('Shot Name', validators=[DataRequired()])
-    description = TextAreaField('Description', validators=[DataRequired()])
-    status_id = SelectField('Status', coerce=int)
-    duration = IntegerField('Duration')
-    notes = TextAreaField('Notes')
-
-
 @shots.route("/create", methods=('GET', 'POST'))
 def create():
     form = ShotForm()
diff --git a/attract/application/modules/shots/forms.py b/attract/application/modules/shots/forms.py
new file mode 100644
index 00000000..56000cfd
--- /dev/null
+++ b/attract/application/modules/shots/forms.py
@@ -0,0 +1,15 @@
+from flask_wtf import Form
+from wtforms import TextField
+from wtforms import BooleanField
+from wtforms import SelectField
+from wtforms import TextAreaField
+from wtforms import IntegerField
+
+from wtforms.validators import DataRequired
+
+class ShotForm(Form):
+    name = TextField('Shot Name', validators=[DataRequired()])
+    description = TextAreaField('Description', validators=[DataRequired()])
+    status_id = SelectField('Status', coerce=int)
+    duration = IntegerField('Duration')
+    notes = TextAreaField('Notes')