diff --git a/controllers/api.go b/controllers/api.go
index ad4828bd..66f1ce7d 100644
--- a/controllers/api.go
+++ b/controllers/api.go
@@ -20,7 +20,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/jinzhu/gorm"
 	"github.com/jordan-wright/email"
-        "../util"
+        "github.com/gophish/gophish/util"
 )
 
 // Worker is the worker that processes phishing events and updates campaigns.
diff --git a/controllers/route.go b/controllers/route.go
index 301a319d..961599a3 100644
--- a/controllers/route.go
+++ b/controllers/route.go
@@ -21,7 +21,7 @@ import (
 	"github.com/gorilla/csrf"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/sessions"
-	"../util"
+	"github.com/gophish/gophish/util"
 )
 
 // Logger is used to send logging messages to stdout.
diff --git a/gophish.go b/gophish.go
index 6703059b..c1eb72d2 100644
--- a/gophish.go
+++ b/gophish.go
@@ -35,10 +35,10 @@ import (
 
 	"github.com/NYTimes/gziphandler"
 	"github.com/gophish/gophish/auth"
-	"./config"
-	"./controllers"
+	"github.com/gophish/gophish/config"
+	"github.com/gophish/gophish/controllers"
 	"github.com/gophish/gophish/models"
-	"./util"
+	"github.com/gophish/gophish/util"
 	"github.com/gorilla/handlers"
 )
 
diff --git a/models/campaign.go b/models/campaign.go
index effe11a5..208f84ce 100644
--- a/models/campaign.go
+++ b/models/campaign.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/jinzhu/gorm"
-        "../util"
+        "github.com/gophish/gophish/util"
 )
 
 // Campaign is a struct representing a created campaign
diff --git a/models/group.go b/models/group.go
index ce4b37fe..a685df56 100644
--- a/models/group.go
+++ b/models/group.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/jinzhu/gorm"
-	"../util"
+	"github.com/gophish/gophish/util"
 )
 
 // Group contains the fields needed for a user -> group mapping
diff --git a/models/models.go b/models/models.go
index 954bd9f8..0c3823f7 100644
--- a/models/models.go
+++ b/models/models.go
@@ -14,7 +14,7 @@ import (
 	"github.com/gophish/gophish/config"
 	"github.com/jinzhu/gorm"
 	_ "github.com/mattn/go-sqlite3" // Blank import needed to import sqlite3
-       "../util"
+       "github.com/gophish/gophish/util"
 )
 
 var db *gorm.DB
diff --git a/models/page.go b/models/page.go
index c68489b4..9e630e94 100644
--- a/models/page.go
+++ b/models/page.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/PuerkitoBio/goquery"
-	"../util"
+	"github.com/gophish/gophish/util"
 )
 
 // Page contains the fields used for a Page model
diff --git a/models/result.go b/models/result.go
index 70c9db48..fe6eedb3 100644
--- a/models/result.go
+++ b/models/result.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/jinzhu/gorm"
 	"github.com/oschwald/maxminddb-golang"
-	"../util"
+	"github.com/gophish/gophish/util"
 )
 
 type mmCity struct {
diff --git a/models/smtp.go b/models/smtp.go
index f7763289..71acdeaf 100644
--- a/models/smtp.go
+++ b/models/smtp.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
-	"../util"
+	"github.com/gophish/gophish/util"
 )
 
 // SMTP contains the attributes needed to handle the sending of campaign emails
diff --git a/models/template.go b/models/template.go
index 5f4a246a..0382cc65 100644
--- a/models/template.go
+++ b/models/template.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/jinzhu/gorm"
-	"../util"
+	"github.com/gophish/gophish/util"
 )
 
 // Template models hold the attributes for an email template to be sent to targets
diff --git a/templates/campaign_results.html b/templates/campaign_results.html
index 37bcc19f..ec98de43 100644
--- a/templates/campaign_results.html
+++ b/templates/campaign_results.html
@@ -159,5 +159,5 @@
                 "Campaign not found!": "{{T "Campaign not found!"}}",
 }
 </script>
-<script src="/js/src/app/campaign_results.js"></script>
+<script src="/js/dist/app/campaign_results.min.js"></script>
 {{end}}
diff --git a/templates/campaigns.html b/templates/campaigns.html
index f4731455..1b6bc559 100644
--- a/templates/campaigns.html
+++ b/templates/campaigns.html
@@ -175,5 +175,5 @@
 		"Error fetching campaigns": "{{T "Error fetching campaigns"}}"
 	}
 </script>
-<script src="/js/src/app/campaigns.js"></script>
+<script src="/js/dist/app/campaigns.min.js"></script>
 {{end}}
diff --git a/templates/dashboard.html b/templates/dashboard.html
index 4416e72c..b0d449d5 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -99,5 +99,5 @@
                 "Error fetching campaigns": "{{T "Error fetching campaigns"}}"
 	}
 </script>
-<script src="/js/src/app/dashboard.js"></script>
+<script src="/js/dist/app/dashboard.min.js"></script>
 {{end}}
diff --git a/templates/sending_profiles.html b/templates/sending_profiles.html
index f5c48690..45120dbc 100644
--- a/templates/sending_profiles.html
+++ b/templates/sending_profiles.html
@@ -149,5 +149,5 @@
 </script>
 <script src="/js/ckeditor/ckeditor.js"></script>
 <script src="/js/ckeditor/adapters/jquery.js"></script>
-<script src="/js/src/app/sending_profiles.js"></script>
+<script src="/js/dist/app/sending_profiles.min.js"></script>
 {{end}}
diff --git a/templates/templates.html b/templates/templates.html
index 76a39b50..7014dea9 100644
--- a/templates/templates.html
+++ b/templates/templates.html
@@ -168,5 +168,5 @@
 </script>
 <script src="/js/src/vendor/ckeditor/ckeditor.js"></script>
 <script src="/js/src/vendor/ckeditor/adapters/jquery.js"></script>
-<script src="/js/src/app/templates.js"></script>
+<script src="/js/dist/app/templates.min.js"></script>
 {{end}}
diff --git a/templates/users.html b/templates/users.html
index a9c2a466..0dde962d 100644
--- a/templates/users.html
+++ b/templates/users.html
@@ -130,5 +130,5 @@
                 "Error fetching groups": "{{T "Error fetching groups"}}"
 	}
 </script>
-<script src="/js/src/app/users.js"></script>
+<script src="/js/dist/app/users.min.js"></script>
 {{end}}