diff --git a/cmd/bbs/config/package.go b/cmd/bbs/config/package.go
new file mode 100644
index 00000000..fa3b9aaa
--- /dev/null
+++ b/cmd/bbs/config/package.go
@@ -0,0 +1 @@
+package config // import "code.cloudfoundry.org/bbs/cmd/bbs/config"
diff --git a/cmd/bbs/package.go b/cmd/bbs/package.go
new file mode 100644
index 00000000..f05696d5
--- /dev/null
+++ b/cmd/bbs/package.go
@@ -0,0 +1 @@
+package main // import "code.cloudfoundry.org/bbs/cmd/bbs"
diff --git a/cmd/bbs/testrunner/package.go b/cmd/bbs/testrunner/package.go
new file mode 100644
index 00000000..e7eb198d
--- /dev/null
+++ b/cmd/bbs/testrunner/package.go
@@ -0,0 +1 @@
+package testrunner // import "code.cloudfoundry.org/bbs/cmd/bbs/testrunner"
diff --git a/controllers/fakes/package.go b/controllers/fakes/package.go
new file mode 100644
index 00000000..76230317
--- /dev/null
+++ b/controllers/fakes/package.go
@@ -0,0 +1 @@
+package fakes // import "code.cloudfoundry.org/bbs/controllers/fakes"
diff --git a/controllers/package.go b/controllers/package.go
new file mode 100644
index 00000000..615644a3
--- /dev/null
+++ b/controllers/package.go
@@ -0,0 +1 @@
+package controllers // import "code.cloudfoundry.org/bbs/controllers"
diff --git a/converger/fake_controllers/package.go b/converger/fake_controllers/package.go
new file mode 100644
index 00000000..70dd4743
--- /dev/null
+++ b/converger/fake_controllers/package.go
@@ -0,0 +1 @@
+package fake_controllers // import "code.cloudfoundry.org/bbs/converger/fake_controllers"
diff --git a/converger/package.go b/converger/package.go
new file mode 100644
index 00000000..d99e8b02
--- /dev/null
+++ b/converger/package.go
@@ -0,0 +1 @@
+package converger // import "code.cloudfoundry.org/bbs/converger"
diff --git a/db/dbfakes/package.go b/db/dbfakes/package.go
new file mode 100644
index 00000000..abcfd336
--- /dev/null
+++ b/db/dbfakes/package.go
@@ -0,0 +1 @@
+package dbfakes // import "code.cloudfoundry.org/bbs/db/dbfakes"
diff --git a/db/deprecations/package.go b/db/deprecations/package.go
new file mode 100644
index 00000000..a6b4aaca
--- /dev/null
+++ b/db/deprecations/package.go
@@ -0,0 +1 @@
+package deprecations // import "code.cloudfoundry.org/bbs/db/deprecations"
diff --git a/db/etcd/fakes/package.go b/db/etcd/fakes/package.go
new file mode 100644
index 00000000..b5b151d2
--- /dev/null
+++ b/db/etcd/fakes/package.go
@@ -0,0 +1 @@
+package fakes // import "code.cloudfoundry.org/bbs/db/etcd/fakes"
diff --git a/db/etcd/package.go b/db/etcd/package.go
new file mode 100644
index 00000000..84d713f4
--- /dev/null
+++ b/db/etcd/package.go
@@ -0,0 +1 @@
+package etcd // import "code.cloudfoundry.org/bbs/db/etcd"
diff --git a/db/etcd/test/etcd_helpers/package.go b/db/etcd/test/etcd_helpers/package.go
new file mode 100644
index 00000000..81163de2
--- /dev/null
+++ b/db/etcd/test/etcd_helpers/package.go
@@ -0,0 +1 @@
+package etcd_helpers // import "code.cloudfoundry.org/bbs/db/etcd/test/etcd_helpers"
diff --git a/db/migrations/package.go b/db/migrations/package.go
new file mode 100644
index 00000000..08f8827a
--- /dev/null
+++ b/db/migrations/package.go
@@ -0,0 +1 @@
+package migrations // import "code.cloudfoundry.org/bbs/db/migrations"
diff --git a/db/package.go b/db/package.go
new file mode 100644
index 00000000..7c1e139c
--- /dev/null
+++ b/db/package.go
@@ -0,0 +1 @@
+package db // import "code.cloudfoundry.org/bbs/db"
diff --git a/db/sqldb/fakesqldriver/fakesqldriverfakes/package.go b/db/sqldb/fakesqldriver/fakesqldriverfakes/package.go
new file mode 100644
index 00000000..b39faebd
--- /dev/null
+++ b/db/sqldb/fakesqldriver/fakesqldriverfakes/package.go
@@ -0,0 +1 @@
+package fakesqldriverfakes // import "code.cloudfoundry.org/bbs/db/sqldb/fakesqldriver/fakesqldriverfakes"
diff --git a/db/sqldb/fakesqldriver/package.go b/db/sqldb/fakesqldriver/package.go
new file mode 100644
index 00000000..f3ed19d4
--- /dev/null
+++ b/db/sqldb/fakesqldriver/package.go
@@ -0,0 +1 @@
+package fakesqldriver // import "code.cloudfoundry.org/bbs/db/sqldb/fakesqldriver"
diff --git a/db/sqldb/helpers/package.go b/db/sqldb/helpers/package.go
new file mode 100644
index 00000000..9b4ab4d6
--- /dev/null
+++ b/db/sqldb/helpers/package.go
@@ -0,0 +1 @@
+package helpers // import "code.cloudfoundry.org/bbs/db/sqldb/helpers"
diff --git a/db/sqldb/package.go b/db/sqldb/package.go
new file mode 100644
index 00000000..5b61b8af
--- /dev/null
+++ b/db/sqldb/package.go
@@ -0,0 +1 @@
+package sqldb // import "code.cloudfoundry.org/bbs/db/sqldb"
diff --git a/encryption/encryptionfakes/package.go b/encryption/encryptionfakes/package.go
new file mode 100644
index 00000000..d72e6261
--- /dev/null
+++ b/encryption/encryptionfakes/package.go
@@ -0,0 +1 @@
+package encryptionfakes // import "code.cloudfoundry.org/bbs/encryption/encryptionfakes"
diff --git a/encryption/package.go b/encryption/package.go
new file mode 100644
index 00000000..2aaa08df
--- /dev/null
+++ b/encryption/package.go
@@ -0,0 +1 @@
+package encryption // import "code.cloudfoundry.org/bbs/encryption"
diff --git a/encryptor/package.go b/encryptor/package.go
new file mode 100644
index 00000000..a53b788f
--- /dev/null
+++ b/encryptor/package.go
@@ -0,0 +1 @@
+package encryptor // import "code.cloudfoundry.org/bbs/encryptor"
diff --git a/events/eventfakes/package.go b/events/eventfakes/package.go
new file mode 100644
index 00000000..338b0264
--- /dev/null
+++ b/events/eventfakes/package.go
@@ -0,0 +1 @@
+package eventfakes // import "code.cloudfoundry.org/bbs/events/eventfakes"
diff --git a/events/package.go b/events/package.go
new file mode 100644
index 00000000..b59b892f
--- /dev/null
+++ b/events/package.go
@@ -0,0 +1 @@
+package events // import "code.cloudfoundry.org/bbs/events"
diff --git a/fake_bbs/package.go b/fake_bbs/package.go
new file mode 100644
index 00000000..ffb2d9e7
--- /dev/null
+++ b/fake_bbs/package.go
@@ -0,0 +1 @@
+package fake_bbs // import "code.cloudfoundry.org/bbs/fake_bbs"
diff --git a/format/formatfakes/package.go b/format/formatfakes/package.go
new file mode 100644
index 00000000..92073766
--- /dev/null
+++ b/format/formatfakes/package.go
@@ -0,0 +1 @@
+package formatfakes // import "code.cloudfoundry.org/bbs/format/formatfakes"
diff --git a/format/package.go b/format/package.go
new file mode 100644
index 00000000..d9000165
--- /dev/null
+++ b/format/package.go
@@ -0,0 +1 @@
+package format // import "code.cloudfoundry.org/bbs/format"
diff --git a/guidprovider/fakes/package.go b/guidprovider/fakes/package.go
new file mode 100644
index 00000000..0f9f5c62
--- /dev/null
+++ b/guidprovider/fakes/package.go
@@ -0,0 +1 @@
+package fakes // import "code.cloudfoundry.org/bbs/guidprovider/fakes"
diff --git a/guidprovider/guidproviderfakes/package.go b/guidprovider/guidproviderfakes/package.go
new file mode 100644
index 00000000..cea80668
--- /dev/null
+++ b/guidprovider/guidproviderfakes/package.go
@@ -0,0 +1 @@
+package guidproviderfakes // import "code.cloudfoundry.org/bbs/guidprovider/guidproviderfakes"
diff --git a/guidprovider/package.go b/guidprovider/package.go
new file mode 100644
index 00000000..40b732f9
--- /dev/null
+++ b/guidprovider/package.go
@@ -0,0 +1 @@
+package guidprovider // import "code.cloudfoundry.org/bbs/guidprovider"
diff --git a/handlers/fake_controllers/package.go b/handlers/fake_controllers/package.go
new file mode 100644
index 00000000..940fd2b5
--- /dev/null
+++ b/handlers/fake_controllers/package.go
@@ -0,0 +1 @@
+package fake_controllers // import "code.cloudfoundry.org/bbs/handlers/fake_controllers"
diff --git a/handlers/middleware/package.go b/handlers/middleware/package.go
new file mode 100644
index 00000000..108ee3d3
--- /dev/null
+++ b/handlers/middleware/package.go
@@ -0,0 +1 @@
+package middleware // import "code.cloudfoundry.org/bbs/handlers/middleware"
diff --git a/handlers/package.go b/handlers/package.go
new file mode 100644
index 00000000..b7355472
--- /dev/null
+++ b/handlers/package.go
@@ -0,0 +1 @@
+package handlers // import "code.cloudfoundry.org/bbs/handlers"
diff --git a/metrics/package.go b/metrics/package.go
new file mode 100644
index 00000000..81c4bc5c
--- /dev/null
+++ b/metrics/package.go
@@ -0,0 +1 @@
+package metrics // import "code.cloudfoundry.org/bbs/metrics"
diff --git a/migration/migrationfakes/package.go b/migration/migrationfakes/package.go
new file mode 100644
index 00000000..27965269
--- /dev/null
+++ b/migration/migrationfakes/package.go
@@ -0,0 +1 @@
+package migrationfakes // import "code.cloudfoundry.org/bbs/migration/migrationfakes"
diff --git a/migration/package.go b/migration/package.go
new file mode 100644
index 00000000..619cb55d
--- /dev/null
+++ b/migration/package.go
@@ -0,0 +1 @@
+package migration // import "code.cloudfoundry.org/bbs/migration"
diff --git a/models/fakes/package.go b/models/fakes/package.go
new file mode 100644
index 00000000..88e54300
--- /dev/null
+++ b/models/fakes/package.go
@@ -0,0 +1 @@
+package fakes // import "code.cloudfoundry.org/bbs/models/fakes"
diff --git a/models/package.go b/models/package.go
new file mode 100644
index 00000000..ab6aeab0
--- /dev/null
+++ b/models/package.go
@@ -0,0 +1 @@
+package models // import "code.cloudfoundry.org/bbs/models"
diff --git a/models/test/matchers/package.go b/models/test/matchers/package.go
new file mode 100644
index 00000000..f54fe4ad
--- /dev/null
+++ b/models/test/matchers/package.go
@@ -0,0 +1 @@
+package matchers // import "code.cloudfoundry.org/bbs/models/test/matchers"
diff --git a/models/test/model_helpers/package.go b/models/test/model_helpers/package.go
new file mode 100644
index 00000000..9ea6fccc
--- /dev/null
+++ b/models/test/model_helpers/package.go
@@ -0,0 +1 @@
+package model_helpers // import "code.cloudfoundry.org/bbs/models/test/model_helpers"
diff --git a/package.go b/package.go
new file mode 100644
index 00000000..0d460353
--- /dev/null
+++ b/package.go
@@ -0,0 +1 @@
+package bbs // import "code.cloudfoundry.org/bbs"
diff --git a/taskworkpool/package.go b/taskworkpool/package.go
new file mode 100644
index 00000000..a766f5a9
--- /dev/null
+++ b/taskworkpool/package.go
@@ -0,0 +1 @@
+package taskworkpool // import "code.cloudfoundry.org/bbs/taskworkpool"
diff --git a/taskworkpool/taskworkpoolfakes/package.go b/taskworkpool/taskworkpoolfakes/package.go
new file mode 100644
index 00000000..3d228366
--- /dev/null
+++ b/taskworkpool/taskworkpoolfakes/package.go
@@ -0,0 +1 @@
+package taskworkpoolfakes // import "code.cloudfoundry.org/bbs/taskworkpool/taskworkpoolfakes"
diff --git a/test_helpers/package.go b/test_helpers/package.go
new file mode 100644
index 00000000..f8058a48
--- /dev/null
+++ b/test_helpers/package.go
@@ -0,0 +1 @@
+package test_helpers // import "code.cloudfoundry.org/bbs/test_helpers"
diff --git a/test_helpers/sqlrunner/package.go b/test_helpers/sqlrunner/package.go
new file mode 100644
index 00000000..0818f481
--- /dev/null
+++ b/test_helpers/sqlrunner/package.go
@@ -0,0 +1 @@
+package sqlrunner // import "code.cloudfoundry.org/bbs/test_helpers/sqlrunner"