diff --git a/app/main/views.py b/app/main/views.py
index 3650e31f69932c46a677da26718d9b2afc8108f2..52dce8d49a05c0b1a804628b86d4115d5ea019ea 100644
--- a/app/main/views.py
+++ b/app/main/views.py
@@ -5,7 +5,7 @@ from flask_login import current_user, login_required
 from . import main
 from .forms import CreateCorpusForm
 from .. import db
-from ..models import Corpus, Job
+from ..models import Corpus, CorpusFile, Job
 import os
 import threading
 
@@ -86,6 +86,14 @@ def dashboard():
         else:
             for file in create_corpus_form.files.data:
                 file.save(os.path.join(dir, file.filename))
+                dir = os.path.join(str(corpus.user_id),
+                                   'corpora',
+                                   str(corpus.id))
+                corpus_file = CorpusFile(filename=file.filename,
+                                         corpus_id=corpus.id,
+                                         dir=dir)
+                db.session.add(corpus_file)
+                db.session.commit()
             flash('Corpus created!')
         return redirect(url_for('main.dashboard'))
 
diff --git a/app/models.py b/app/models.py
index 7a2fe19b126f567e01a77ba8c22f25eb3a5b0cc8..cc143f8bd61e0526a5ec8c492989c254e1f39ce8 100644
--- a/app/models.py
+++ b/app/models.py
@@ -258,6 +258,7 @@ class JobInput(db.Model):
     # Primary key
     id = db.Column(db.Integer, primary_key=True)
     filename = db.Column(db.String(255))
+    dir = db.Column(db.String(255))
     job_id = db.Column(db.Integer, db.ForeignKey('jobs.id'))
     # Relationships
     results = db.relationship('JobResult',
@@ -285,6 +286,7 @@ class JobResult(db.Model):
     # Primary key
     id = db.Column(db.Integer, primary_key=True)
     filename = db.Column(db.String(255))
+    dir = db.Column(db.String(255))
     job_id = db.Column(db.Integer, db.ForeignKey('jobs.id'))
     job_input_id = db.Column(db.Integer, db.ForeignKey('job_inputs.id'))
 
@@ -398,6 +400,7 @@ class CorpusFile(db.Model):
     # Primary key
     id = db.Column(db.Integer, primary_key=True)
     filename = db.Column(db.String(255))
+    dir = db.Column(db.String(255))
     corpus_id = db.Column(db.Integer, db.ForeignKey('corpora.id'))