diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 00d33b439..8e478cfd6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -90,4 +90,4 @@ To support a new release that breaks API following changes needs to be done:
   silences (depending if both need a new code) under mapper/vXY (X major
   Alertmanager version, Y minor version).
 * Register new mapper in the `init()` function in the
-  `alertmanager/mapper.go` file.
+  `internal/alertmanager/mapper.go` file.
diff --git a/Makefile b/Makefile
index 205a1c3fb..c9609cab6 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ NAME    := unsee
 VERSION := $(shell git describe --tags --always --dirty='-dev')
 
 # Alertmanager instance used when running locally, points to mock data
-MOCK_PATH         := $(CURDIR)/mock/0.8.0
+MOCK_PATH         := $(CURDIR)/internal/mock/0.8.0
 ALERTMANAGER_URIS := "mock:file://$(MOCK_PATH)"
 # Listen port when running locally
 PORT := 8080
diff --git a/alerts.go b/alerts.go
index 4ff0793f1..c8dc65f55 100644
--- a/alerts.go
+++ b/alerts.go
@@ -3,9 +3,9 @@ package main
 import (
 	"strings"
 
-	"github.com/cloudflare/unsee/alertmanager"
-	"github.com/cloudflare/unsee/filters"
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/alertmanager"
+	"github.com/cloudflare/unsee/internal/filters"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 func getFiltersFromQuery(filterString string) ([]filters.FilterT, bool) {
diff --git a/api_test.go b/api_test.go
index 6a9e9c8f2..8cf3cd316 100644
--- a/api_test.go
+++ b/api_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/blang/semver"
-	"github.com/cloudflare/unsee/mock"
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/mock"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type groupTest struct {
diff --git a/alertmanager/benchmark_test.go b/internal/alertmanager/benchmark_test.go
similarity index 87%
rename from alertmanager/benchmark_test.go
rename to internal/alertmanager/benchmark_test.go
index 94e9e18b9..1db0b6f35 100644
--- a/alertmanager/benchmark_test.go
+++ b/internal/alertmanager/benchmark_test.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/cloudflare/unsee/alertmanager"
-	"github.com/cloudflare/unsee/config"
+	"github.com/cloudflare/unsee/internal/alertmanager"
+	"github.com/cloudflare/unsee/internal/config"
 )
 
 func BenchmarkDedupAlerts(b *testing.B) {
diff --git a/alertmanager/dedup.go b/internal/alertmanager/dedup.go
similarity index 97%
rename from alertmanager/dedup.go
rename to internal/alertmanager/dedup.go
index 4e3ec21d6..b20a1545a 100644
--- a/alertmanager/dedup.go
+++ b/internal/alertmanager/dedup.go
@@ -3,8 +3,8 @@ package alertmanager
 import (
 	"sort"
 
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/slices"
 )
 
 // DedupAlerts will collect alert groups from all defined Alertmanager
diff --git a/alertmanager/dedup_test.go b/internal/alertmanager/dedup_test.go
similarity index 92%
rename from alertmanager/dedup_test.go
rename to internal/alertmanager/dedup_test.go
index 19d8e2153..1ed366400 100644
--- a/alertmanager/dedup_test.go
+++ b/internal/alertmanager/dedup_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cloudflare/unsee/alertmanager"
-	"github.com/cloudflare/unsee/config"
-	"github.com/cloudflare/unsee/mock"
+	"github.com/cloudflare/unsee/internal/alertmanager"
+	"github.com/cloudflare/unsee/internal/config"
+	"github.com/cloudflare/unsee/internal/mock"
 
 	log "github.com/sirupsen/logrus"
 )
diff --git a/alertmanager/mapper.go b/internal/alertmanager/mapper.go
similarity index 59%
rename from alertmanager/mapper.go
rename to internal/alertmanager/mapper.go
index e33881622..2d15f1bc4 100644
--- a/alertmanager/mapper.go
+++ b/internal/alertmanager/mapper.go
@@ -1,11 +1,11 @@
 package alertmanager
 
 import (
-	"github.com/cloudflare/unsee/mapper"
-	"github.com/cloudflare/unsee/mapper/v04"
-	"github.com/cloudflare/unsee/mapper/v05"
-	"github.com/cloudflare/unsee/mapper/v061"
-	"github.com/cloudflare/unsee/mapper/v062"
+	"github.com/cloudflare/unsee/internal/mapper"
+	"github.com/cloudflare/unsee/internal/mapper/v04"
+	"github.com/cloudflare/unsee/internal/mapper/v05"
+	"github.com/cloudflare/unsee/internal/mapper/v061"
+	"github.com/cloudflare/unsee/internal/mapper/v062"
 )
 
 // initialize all mappers
diff --git a/alertmanager/metrics.go b/internal/alertmanager/metrics.go
similarity index 100%
rename from alertmanager/metrics.go
rename to internal/alertmanager/metrics.go
diff --git a/alertmanager/models.go b/internal/alertmanager/models.go
similarity index 96%
rename from alertmanager/models.go
rename to internal/alertmanager/models.go
index 4455a86c6..ba6149e04 100644
--- a/alertmanager/models.go
+++ b/internal/alertmanager/models.go
@@ -6,11 +6,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/cloudflare/unsee/config"
-	"github.com/cloudflare/unsee/mapper"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transform"
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/config"
+	"github.com/cloudflare/unsee/internal/mapper"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transform"
+	"github.com/cloudflare/unsee/internal/transport"
 
 	log "github.com/sirupsen/logrus"
 )
diff --git a/alertmanager/upstream.go b/internal/alertmanager/upstream.go
similarity index 96%
rename from alertmanager/upstream.go
rename to internal/alertmanager/upstream.go
index 762fd5457..0423d1d2d 100644
--- a/alertmanager/upstream.go
+++ b/internal/alertmanager/upstream.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 
 	log "github.com/sirupsen/logrus"
 )
diff --git a/alertmanager/version.go b/internal/alertmanager/version.go
similarity index 96%
rename from alertmanager/version.go
rename to internal/alertmanager/version.go
index 9449bfac0..0ff58e26a 100644
--- a/alertmanager/version.go
+++ b/internal/alertmanager/version.go
@@ -3,7 +3,7 @@ package alertmanager
 import (
 	"time"
 
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/transport"
 
 	log "github.com/sirupsen/logrus"
 )
diff --git a/config/config.go b/internal/config/config.go
similarity index 100%
rename from config/config.go
rename to internal/config/config.go
diff --git a/config/config_test.go b/internal/config/config_test.go
similarity index 98%
rename from config/config_test.go
rename to internal/config/config_test.go
index b3717a75f..905d0f0d9 100644
--- a/config/config_test.go
+++ b/internal/config/config_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/slices"
 )
 
 type flagNameTest struct {
diff --git a/filters/autocomplete.go b/internal/filters/autocomplete.go
similarity index 87%
rename from filters/autocomplete.go
rename to internal/filters/autocomplete.go
index 7b7c884ac..3a941c478 100644
--- a/filters/autocomplete.go
+++ b/internal/filters/autocomplete.go
@@ -1,7 +1,7 @@
 package filters
 
 import (
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type autocompleteFactory func(name string, operators []string, alerts []models.Alert) []models.Autocomplete
diff --git a/filters/filter.go b/internal/filters/filter.go
similarity index 96%
rename from filters/filter.go
rename to internal/filters/filter.go
index 7f4e80ab1..99543205a 100644
--- a/filters/filter.go
+++ b/internal/filters/filter.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/slices"
 )
 
 // FilterT provides methods for interacting with alert filters
diff --git a/filters/filter_age.go b/internal/filters/filter_age.go
similarity index 96%
rename from filters/filter_age.go
rename to internal/filters/filter_age.go
index 7e245e9ac..9d9c36f42 100644
--- a/filters/filter_age.go
+++ b/internal/filters/filter_age.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type ageFilter struct {
diff --git a/filters/filter_alertmanager.go b/internal/filters/filter_alertmanager.go
similarity index 96%
rename from filters/filter_alertmanager.go
rename to internal/filters/filter_alertmanager.go
index 726542064..b1891ba29 100644
--- a/filters/filter_alertmanager.go
+++ b/internal/filters/filter_alertmanager.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type alertmanagerInstanceFilter struct {
diff --git a/filters/filter_fuzzy.go b/internal/filters/filter_fuzzy.go
similarity index 96%
rename from filters/filter_fuzzy.go
rename to internal/filters/filter_fuzzy.go
index af7485a72..1dae8e2b2 100644
--- a/filters/filter_fuzzy.go
+++ b/internal/filters/filter_fuzzy.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type fuzzyFilter struct {
diff --git a/filters/filter_invalid.go b/internal/filters/filter_invalid.go
similarity index 100%
rename from filters/filter_invalid.go
rename to internal/filters/filter_invalid.go
diff --git a/filters/filter_label.go b/internal/filters/filter_label.go
similarity index 97%
rename from filters/filter_label.go
rename to internal/filters/filter_label.go
index 53b0ce9bc..070babe00 100644
--- a/filters/filter_label.go
+++ b/internal/filters/filter_label.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type labelFilter struct {
diff --git a/filters/filter_limit.go b/internal/filters/filter_limit.go
similarity index 96%
rename from filters/filter_limit.go
rename to internal/filters/filter_limit.go
index 9b0126e3a..0f98761cb 100644
--- a/filters/filter_limit.go
+++ b/internal/filters/filter_limit.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type limitFilter struct {
diff --git a/filters/filter_receiver.go b/internal/filters/filter_receiver.go
similarity index 97%
rename from filters/filter_receiver.go
rename to internal/filters/filter_receiver.go
index 7a8e98d0a..3c21171ae 100644
--- a/filters/filter_receiver.go
+++ b/internal/filters/filter_receiver.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type receiverFilter struct {
diff --git a/filters/filter_silence_author.go b/internal/filters/filter_silence_author.go
similarity index 97%
rename from filters/filter_silence_author.go
rename to internal/filters/filter_silence_author.go
index d39cf10e0..f5ff3dff2 100644
--- a/filters/filter_silence_author.go
+++ b/internal/filters/filter_silence_author.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type silenceAuthorFilter struct {
diff --git a/filters/filter_silence_jira.go b/internal/filters/filter_silence_jira.go
similarity index 97%
rename from filters/filter_silence_jira.go
rename to internal/filters/filter_silence_jira.go
index 8f62f37d5..24fc8a4c2 100644
--- a/filters/filter_silence_jira.go
+++ b/internal/filters/filter_silence_jira.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type silenceJiraFilter struct {
diff --git a/filters/filter_state.go b/internal/filters/filter_state.go
similarity index 92%
rename from filters/filter_state.go
rename to internal/filters/filter_state.go
index dac5c7735..7a42e0487 100644
--- a/filters/filter_state.go
+++ b/internal/filters/filter_state.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/slices"
 )
 
 type stateFilter struct {
diff --git a/filters/filter_test.go b/internal/filters/filter_test.go
similarity index 99%
rename from filters/filter_test.go
rename to internal/filters/filter_test.go
index cd753a4c8..e0dfb7515 100644
--- a/filters/filter_test.go
+++ b/internal/filters/filter_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cloudflare/unsee/alertmanager"
-	"github.com/cloudflare/unsee/filters"
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/alertmanager"
+	"github.com/cloudflare/unsee/internal/filters"
+	"github.com/cloudflare/unsee/internal/models"
 
 	log "github.com/sirupsen/logrus"
 )
diff --git a/filters/matcher.go b/internal/filters/matcher.go
similarity index 100%
rename from filters/matcher.go
rename to internal/filters/matcher.go
diff --git a/filters/matcher_test.go b/internal/filters/matcher_test.go
similarity index 100%
rename from filters/matcher_test.go
rename to internal/filters/matcher_test.go
diff --git a/filters/registry.go b/internal/filters/registry.go
similarity index 100%
rename from filters/registry.go
rename to internal/filters/registry.go
diff --git a/mapper/mapper.go b/internal/mapper/mapper.go
similarity index 97%
rename from mapper/mapper.go
rename to internal/mapper/mapper.go
index 13a1a47a7..2d1bcb778 100644
--- a/mapper/mapper.go
+++ b/internal/mapper/mapper.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 var (
diff --git a/mapper/v04/alerts.go b/internal/mapper/v04/alerts.go
similarity index 96%
rename from mapper/v04/alerts.go
rename to internal/mapper/v04/alerts.go
index 2e79e6728..2ba82b7f7 100644
--- a/mapper/v04/alerts.go
+++ b/internal/mapper/v04/alerts.go
@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/cloudflare/unsee/mapper"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/mapper"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transport"
 )
 
 type alert struct {
diff --git a/mapper/v04/silences.go b/internal/mapper/v04/silences.go
similarity index 94%
rename from mapper/v04/silences.go
rename to internal/mapper/v04/silences.go
index c3fb5b5c8..9439c6b4d 100644
--- a/mapper/v04/silences.go
+++ b/internal/mapper/v04/silences.go
@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/cloudflare/unsee/mapper"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/mapper"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transport"
 )
 
 // Alertmanager 0.4 silence format
diff --git a/mapper/v05/alerts.go b/internal/mapper/v05/alerts.go
similarity index 95%
rename from mapper/v05/alerts.go
rename to internal/mapper/v05/alerts.go
index 3c0f7e7ff..8a9089247 100644
--- a/mapper/v05/alerts.go
+++ b/internal/mapper/v05/alerts.go
@@ -10,9 +10,9 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/cloudflare/unsee/mapper"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/mapper"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transport"
 )
 
 type alert struct {
diff --git a/mapper/v05/silences.go b/internal/mapper/v05/silences.go
similarity index 93%
rename from mapper/v05/silences.go
rename to internal/mapper/v05/silences.go
index cfd815c8c..118ded6b0 100644
--- a/mapper/v05/silences.go
+++ b/internal/mapper/v05/silences.go
@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/cloudflare/unsee/mapper"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/mapper"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transport"
 )
 
 type silence struct {
diff --git a/mapper/v061/alerts.go b/internal/mapper/v061/alerts.go
similarity index 95%
rename from mapper/v061/alerts.go
rename to internal/mapper/v061/alerts.go
index 1afe923f1..60283f359 100644
--- a/mapper/v061/alerts.go
+++ b/internal/mapper/v061/alerts.go
@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/cloudflare/unsee/mapper"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/mapper"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transport"
 )
 
 type alert struct {
diff --git a/mapper/v062/alerts.go b/internal/mapper/v062/alerts.go
similarity index 95%
rename from mapper/v062/alerts.go
rename to internal/mapper/v062/alerts.go
index 8fa6b2693..a3831397f 100644
--- a/mapper/v062/alerts.go
+++ b/internal/mapper/v062/alerts.go
@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/cloudflare/unsee/mapper"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/mapper"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transport"
 )
 
 type alertStatus struct {
diff --git a/mock/0.4.0/.ok b/internal/mock/0.4.0/.ok
similarity index 100%
rename from mock/0.4.0/.ok
rename to internal/mock/0.4.0/.ok
diff --git a/mock/0.4.0/api/v1/alerts/groups b/internal/mock/0.4.0/api/v1/alerts/groups
similarity index 100%
rename from mock/0.4.0/api/v1/alerts/groups
rename to internal/mock/0.4.0/api/v1/alerts/groups
diff --git a/mock/0.4.0/api/v1/silences b/internal/mock/0.4.0/api/v1/silences
similarity index 100%
rename from mock/0.4.0/api/v1/silences
rename to internal/mock/0.4.0/api/v1/silences
diff --git a/mock/0.4.0/api/v1/status b/internal/mock/0.4.0/api/v1/status
similarity index 100%
rename from mock/0.4.0/api/v1/status
rename to internal/mock/0.4.0/api/v1/status
diff --git a/mock/0.4.1/.ok b/internal/mock/0.4.1/.ok
similarity index 100%
rename from mock/0.4.1/.ok
rename to internal/mock/0.4.1/.ok
diff --git a/mock/0.4.1/api/v1/alerts/groups b/internal/mock/0.4.1/api/v1/alerts/groups
similarity index 100%
rename from mock/0.4.1/api/v1/alerts/groups
rename to internal/mock/0.4.1/api/v1/alerts/groups
diff --git a/mock/0.4.1/api/v1/silences b/internal/mock/0.4.1/api/v1/silences
similarity index 100%
rename from mock/0.4.1/api/v1/silences
rename to internal/mock/0.4.1/api/v1/silences
diff --git a/mock/0.4.1/api/v1/status b/internal/mock/0.4.1/api/v1/status
similarity index 100%
rename from mock/0.4.1/api/v1/status
rename to internal/mock/0.4.1/api/v1/status
diff --git a/mock/0.4.2/.ok b/internal/mock/0.4.2/.ok
similarity index 100%
rename from mock/0.4.2/.ok
rename to internal/mock/0.4.2/.ok
diff --git a/mock/0.4.2/api/v1/alerts/groups b/internal/mock/0.4.2/api/v1/alerts/groups
similarity index 100%
rename from mock/0.4.2/api/v1/alerts/groups
rename to internal/mock/0.4.2/api/v1/alerts/groups
diff --git a/mock/0.4.2/api/v1/silences b/internal/mock/0.4.2/api/v1/silences
similarity index 100%
rename from mock/0.4.2/api/v1/silences
rename to internal/mock/0.4.2/api/v1/silences
diff --git a/mock/0.4.2/api/v1/status b/internal/mock/0.4.2/api/v1/status
similarity index 100%
rename from mock/0.4.2/api/v1/status
rename to internal/mock/0.4.2/api/v1/status
diff --git a/mock/0.5.0/.ok b/internal/mock/0.5.0/.ok
similarity index 100%
rename from mock/0.5.0/.ok
rename to internal/mock/0.5.0/.ok
diff --git a/mock/0.5.0/api/v1/alerts/groups b/internal/mock/0.5.0/api/v1/alerts/groups
similarity index 100%
rename from mock/0.5.0/api/v1/alerts/groups
rename to internal/mock/0.5.0/api/v1/alerts/groups
diff --git a/mock/0.5.0/api/v1/silences b/internal/mock/0.5.0/api/v1/silences
similarity index 100%
rename from mock/0.5.0/api/v1/silences
rename to internal/mock/0.5.0/api/v1/silences
diff --git a/mock/0.5.0/api/v1/status b/internal/mock/0.5.0/api/v1/status
similarity index 100%
rename from mock/0.5.0/api/v1/status
rename to internal/mock/0.5.0/api/v1/status
diff --git a/mock/0.5.1/.ok b/internal/mock/0.5.1/.ok
similarity index 100%
rename from mock/0.5.1/.ok
rename to internal/mock/0.5.1/.ok
diff --git a/mock/0.5.1/api/v1/alerts/groups b/internal/mock/0.5.1/api/v1/alerts/groups
similarity index 100%
rename from mock/0.5.1/api/v1/alerts/groups
rename to internal/mock/0.5.1/api/v1/alerts/groups
diff --git a/mock/0.5.1/api/v1/silences b/internal/mock/0.5.1/api/v1/silences
similarity index 100%
rename from mock/0.5.1/api/v1/silences
rename to internal/mock/0.5.1/api/v1/silences
diff --git a/mock/0.5.1/api/v1/status b/internal/mock/0.5.1/api/v1/status
similarity index 100%
rename from mock/0.5.1/api/v1/status
rename to internal/mock/0.5.1/api/v1/status
diff --git a/mock/0.6.0/.ok b/internal/mock/0.6.0/.ok
similarity index 100%
rename from mock/0.6.0/.ok
rename to internal/mock/0.6.0/.ok
diff --git a/mock/0.6.0/api/v1/alerts/groups b/internal/mock/0.6.0/api/v1/alerts/groups
similarity index 100%
rename from mock/0.6.0/api/v1/alerts/groups
rename to internal/mock/0.6.0/api/v1/alerts/groups
diff --git a/mock/0.6.0/api/v1/silences b/internal/mock/0.6.0/api/v1/silences
similarity index 100%
rename from mock/0.6.0/api/v1/silences
rename to internal/mock/0.6.0/api/v1/silences
diff --git a/mock/0.6.0/api/v1/status b/internal/mock/0.6.0/api/v1/status
similarity index 100%
rename from mock/0.6.0/api/v1/status
rename to internal/mock/0.6.0/api/v1/status
diff --git a/mock/0.6.2/.ok b/internal/mock/0.6.2/.ok
similarity index 100%
rename from mock/0.6.2/.ok
rename to internal/mock/0.6.2/.ok
diff --git a/mock/0.6.2/api/v1/alerts/groups b/internal/mock/0.6.2/api/v1/alerts/groups
similarity index 100%
rename from mock/0.6.2/api/v1/alerts/groups
rename to internal/mock/0.6.2/api/v1/alerts/groups
diff --git a/mock/0.6.2/api/v1/silences b/internal/mock/0.6.2/api/v1/silences
similarity index 100%
rename from mock/0.6.2/api/v1/silences
rename to internal/mock/0.6.2/api/v1/silences
diff --git a/mock/0.6.2/api/v1/status b/internal/mock/0.6.2/api/v1/status
similarity index 100%
rename from mock/0.6.2/api/v1/status
rename to internal/mock/0.6.2/api/v1/status
diff --git a/mock/0.7.0/.ok b/internal/mock/0.7.0/.ok
similarity index 100%
rename from mock/0.7.0/.ok
rename to internal/mock/0.7.0/.ok
diff --git a/mock/0.7.0/api/v1/alerts/groups b/internal/mock/0.7.0/api/v1/alerts/groups
similarity index 100%
rename from mock/0.7.0/api/v1/alerts/groups
rename to internal/mock/0.7.0/api/v1/alerts/groups
diff --git a/mock/0.7.0/api/v1/silences b/internal/mock/0.7.0/api/v1/silences
similarity index 100%
rename from mock/0.7.0/api/v1/silences
rename to internal/mock/0.7.0/api/v1/silences
diff --git a/mock/0.7.0/api/v1/status b/internal/mock/0.7.0/api/v1/status
similarity index 100%
rename from mock/0.7.0/api/v1/status
rename to internal/mock/0.7.0/api/v1/status
diff --git a/mock/0.7.1/.ok b/internal/mock/0.7.1/.ok
similarity index 100%
rename from mock/0.7.1/.ok
rename to internal/mock/0.7.1/.ok
diff --git a/mock/0.7.1/api/v1/alerts/groups b/internal/mock/0.7.1/api/v1/alerts/groups
similarity index 100%
rename from mock/0.7.1/api/v1/alerts/groups
rename to internal/mock/0.7.1/api/v1/alerts/groups
diff --git a/mock/0.7.1/api/v1/silences b/internal/mock/0.7.1/api/v1/silences
similarity index 100%
rename from mock/0.7.1/api/v1/silences
rename to internal/mock/0.7.1/api/v1/silences
diff --git a/mock/0.7.1/api/v1/status b/internal/mock/0.7.1/api/v1/status
similarity index 100%
rename from mock/0.7.1/api/v1/status
rename to internal/mock/0.7.1/api/v1/status
diff --git a/mock/0.8.0/.ok b/internal/mock/0.8.0/.ok
similarity index 100%
rename from mock/0.8.0/.ok
rename to internal/mock/0.8.0/.ok
diff --git a/mock/0.8.0/api/v1/alerts/groups b/internal/mock/0.8.0/api/v1/alerts/groups
similarity index 100%
rename from mock/0.8.0/api/v1/alerts/groups
rename to internal/mock/0.8.0/api/v1/alerts/groups
diff --git a/mock/0.8.0/api/v1/silences b/internal/mock/0.8.0/api/v1/silences
similarity index 100%
rename from mock/0.8.0/api/v1/silences
rename to internal/mock/0.8.0/api/v1/silences
diff --git a/mock/0.8.0/api/v1/status b/internal/mock/0.8.0/api/v1/status
similarity index 100%
rename from mock/0.8.0/api/v1/status
rename to internal/mock/0.8.0/api/v1/status
diff --git a/mock/Makefile b/internal/mock/Makefile
similarity index 100%
rename from mock/Makefile
rename to internal/mock/Makefile
diff --git a/mock/alertmanager.yml b/internal/mock/alertmanager.yml
similarity index 100%
rename from mock/alertmanager.yml
rename to internal/mock/alertmanager.yml
diff --git a/mock/livemock.py b/internal/mock/livemock.py
similarity index 100%
rename from mock/livemock.py
rename to internal/mock/livemock.py
diff --git a/mock/mock.go b/internal/mock/mock.go
similarity index 100%
rename from mock/mock.go
rename to internal/mock/mock.go
diff --git a/models/alert.go b/internal/models/alert.go
similarity index 100%
rename from models/alert.go
rename to internal/models/alert.go
diff --git a/models/alert_test.go b/internal/models/alert_test.go
similarity index 98%
rename from models/alert_test.go
rename to internal/models/alert_test.go
index e9c8ac0da..4cac8c5dc 100644
--- a/models/alert_test.go
+++ b/internal/models/alert_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type alertStateTest struct {
diff --git a/models/alertgroup.go b/internal/models/alertgroup.go
similarity index 100%
rename from models/alertgroup.go
rename to internal/models/alertgroup.go
diff --git a/models/alertgroup_test.go b/internal/models/alertgroup_test.go
similarity index 99%
rename from models/alertgroup_test.go
rename to internal/models/alertgroup_test.go
index 1e9e05ed2..5e3e1ab14 100644
--- a/models/alertgroup_test.go
+++ b/internal/models/alertgroup_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type alertListSortTest struct {
diff --git a/models/alertmanager.go b/internal/models/alertmanager.go
similarity index 100%
rename from models/alertmanager.go
rename to internal/models/alertmanager.go
diff --git a/models/api.go b/internal/models/api.go
similarity index 100%
rename from models/api.go
rename to internal/models/api.go
diff --git a/models/silence.go b/internal/models/silence.go
similarity index 100%
rename from models/silence.go
rename to internal/models/silence.go
diff --git a/slices/slices.go b/internal/slices/slices.go
similarity index 100%
rename from slices/slices.go
rename to internal/slices/slices.go
diff --git a/slices/slices_test.go b/internal/slices/slices_test.go
similarity index 97%
rename from slices/slices_test.go
rename to internal/slices/slices_test.go
index 1afc117d3..7a8a90e29 100644
--- a/slices/slices_test.go
+++ b/internal/slices/slices_test.go
@@ -3,7 +3,7 @@ package slices_test
 import (
 	"testing"
 
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/slices"
 )
 
 type stringSliceTest struct {
diff --git a/transform/autocomplete.go b/internal/transform/autocomplete.go
similarity index 86%
rename from transform/autocomplete.go
rename to internal/transform/autocomplete.go
index 4dfe23f6f..0e5c6cafb 100644
--- a/transform/autocomplete.go
+++ b/internal/transform/autocomplete.go
@@ -1,8 +1,8 @@
 package transform
 
 import (
-	"github.com/cloudflare/unsee/filters"
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/filters"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 // BuildAutocomplete takes an alert object and generates list of autocomplete
diff --git a/transform/color_test.go b/internal/transform/color_test.go
similarity index 92%
rename from transform/color_test.go
rename to internal/transform/color_test.go
index 5a11c909e..cf42f72c7 100644
--- a/transform/color_test.go
+++ b/internal/transform/color_test.go
@@ -3,9 +3,9 @@ package transform_test
 import (
 	"testing"
 
-	"github.com/cloudflare/unsee/config"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transform"
+	"github.com/cloudflare/unsee/internal/config"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transform"
 )
 
 type colorTest struct {
diff --git a/transform/colors.go b/internal/transform/colors.go
similarity index 92%
rename from transform/colors.go
rename to internal/transform/colors.go
index 29f9da76f..cd346960a 100644
--- a/transform/colors.go
+++ b/internal/transform/colors.go
@@ -5,9 +5,9 @@ import (
 	"io"
 	"math/rand"
 
-	"github.com/cloudflare/unsee/config"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/config"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/slices"
 
 	"github.com/hansrodtang/randomcolor"
 )
diff --git a/transform/jira.go b/internal/transform/jira.go
similarity index 96%
rename from transform/jira.go
rename to internal/transform/jira.go
index 523a78307..47eeab2fc 100644
--- a/transform/jira.go
+++ b/internal/transform/jira.go
@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type jiraDetectRule struct {
diff --git a/transform/jira_test.go b/internal/transform/jira_test.go
similarity index 94%
rename from transform/jira_test.go
rename to internal/transform/jira_test.go
index 3b755e421..4d30603d9 100644
--- a/transform/jira_test.go
+++ b/internal/transform/jira_test.go
@@ -3,8 +3,8 @@ package transform_test
 import (
 	"testing"
 
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transform"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transform"
 )
 
 type jiraTest struct {
diff --git a/transform/links.go b/internal/transform/links.go
similarity index 93%
rename from transform/links.go
rename to internal/transform/links.go
index a6e0dc80a..2fd9deb71 100644
--- a/transform/links.go
+++ b/internal/transform/links.go
@@ -3,7 +3,7 @@ package transform
 import (
 	"net/url"
 
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/slices"
 )
 
 // list of URI schema which we turn into links in the UI
diff --git a/transform/links_test.go b/internal/transform/links_test.go
similarity index 97%
rename from transform/links_test.go
rename to internal/transform/links_test.go
index 7085345df..77b92dca2 100644
--- a/transform/links_test.go
+++ b/internal/transform/links_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/cloudflare/unsee/transform"
+	"github.com/cloudflare/unsee/internal/transform"
 )
 
 type linkTest struct {
diff --git a/transform/strip.go b/internal/transform/strip.go
similarity index 93%
rename from transform/strip.go
rename to internal/transform/strip.go
index db03a37de..91b9c71c4 100644
--- a/transform/strip.go
+++ b/internal/transform/strip.go
@@ -3,7 +3,7 @@ package transform
 import (
 	"strings"
 
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/slices"
 )
 
 // StripLables allows filtering out some labels from alerts
diff --git a/transform/strip_test.go b/internal/transform/strip_test.go
similarity index 96%
rename from transform/strip_test.go
rename to internal/transform/strip_test.go
index fe90f4266..2152588ea 100644
--- a/transform/strip_test.go
+++ b/internal/transform/strip_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/cloudflare/unsee/transform"
+	"github.com/cloudflare/unsee/internal/transform"
 )
 
 type stripTest struct {
diff --git a/transport/file.go b/internal/transport/file.go
similarity index 100%
rename from transport/file.go
rename to internal/transport/file.go
diff --git a/transport/http.go b/internal/transport/http.go
similarity index 100%
rename from transport/http.go
rename to internal/transport/http.go
diff --git a/transport/transport.go b/internal/transport/transport.go
similarity index 100%
rename from transport/transport.go
rename to internal/transport/transport.go
diff --git a/transport/transport_test.go b/internal/transport/transport_test.go
similarity index 95%
rename from transport/transport_test.go
rename to internal/transport/transport_test.go
index e1201a5c4..6f92ed510 100644
--- a/transport/transport_test.go
+++ b/internal/transport/transport_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cloudflare/unsee/mock"
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/mock"
+	"github.com/cloudflare/unsee/internal/transport"
 
 	log "github.com/sirupsen/logrus"
 	httpmock "gopkg.in/jarcoal/httpmock.v1"
diff --git a/transport/urls.go b/internal/transport/urls.go
similarity index 100%
rename from transport/urls.go
rename to internal/transport/urls.go
diff --git a/transport/urls_test.go b/internal/transport/urls_test.go
similarity index 94%
rename from transport/urls_test.go
rename to internal/transport/urls_test.go
index a7b2d63e8..9e3c715ed 100644
--- a/transport/urls_test.go
+++ b/internal/transport/urls_test.go
@@ -3,7 +3,7 @@ package transport_test
 import (
 	"testing"
 
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/transport"
 )
 
 type joinURLTest struct {
diff --git a/main.go b/main.go
index 2afd7272a..52da73413 100644
--- a/main.go
+++ b/main.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cloudflare/unsee/alertmanager"
-	"github.com/cloudflare/unsee/config"
-	"github.com/cloudflare/unsee/transform"
+	"github.com/cloudflare/unsee/internal/alertmanager"
+	"github.com/cloudflare/unsee/internal/config"
+	"github.com/cloudflare/unsee/internal/transform"
 
 	"github.com/DeanThompson/ginpprof"
 	"github.com/gin-contrib/static"
diff --git a/timer.go b/timer.go
index e62456674..9f288107e 100644
--- a/timer.go
+++ b/timer.go
@@ -4,7 +4,7 @@ import (
 	"runtime"
 	"sync"
 
-	"github.com/cloudflare/unsee/alertmanager"
+	"github.com/cloudflare/unsee/internal/alertmanager"
 
 	log "github.com/sirupsen/logrus"
 )
diff --git a/views.go b/views.go
index 48cb701de..3f0da66b1 100644
--- a/views.go
+++ b/views.go
@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cloudflare/unsee/alertmanager"
-	"github.com/cloudflare/unsee/config"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/alertmanager"
+	"github.com/cloudflare/unsee/internal/config"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/slices"
 
 	"github.com/gin-gonic/gin"
 
diff --git a/views_test.go b/views_test.go
index b6431b31e..967bf104c 100644
--- a/views_test.go
+++ b/views_test.go
@@ -11,10 +11,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cloudflare/unsee/config"
-	"github.com/cloudflare/unsee/mock"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/config"
+	"github.com/cloudflare/unsee/internal/mock"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/slices"
 
 	cache "github.com/patrickmn/go-cache"
 	log "github.com/sirupsen/logrus"