diff --git a/doc.go b/doc.go
new file mode 100644
index 0000000000..07dd0dc975
--- /dev/null
+++ b/doc.go
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Package agones is a library for hosting, running and scaling dedicated game servers on Kubernetes.
+package agones // import "agones.dev/agones"
diff --git a/pkg/apis/doc.go b/pkg/apis/doc.go
new file mode 100644
index 0000000000..11808613f6
--- /dev/null
+++ b/pkg/apis/doc.go
@@ -0,0 +1,16 @@
+// Copyright 2018 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package apis contains all the types for the Custom Resource Definitions
+package apis
diff --git a/pkg/client/doc.go b/pkg/client/doc.go
new file mode 100644
index 0000000000..19a5c9fecc
--- /dev/null
+++ b/pkg/client/doc.go
@@ -0,0 +1,16 @@
+// Copyright 2018 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package client contains the generated client for the Custom Resource Definitions
+package client
diff --git a/pkg/doc.go b/pkg/doc.go
new file mode 100644
index 0000000000..17da60d89b
--- /dev/null
+++ b/pkg/doc.go
@@ -0,0 +1,15 @@
+// Copyright 2018 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pkg
diff --git a/pkg/util/doc.go b/pkg/util/doc.go
new file mode 100644
index 0000000000..c62b4726fb
--- /dev/null
+++ b/pkg/util/doc.go
@@ -0,0 +1,16 @@
+// Copyright 2018 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package util is for general libraries that aren't specific to Agones
+package util
diff --git a/pkg/version.go b/pkg/version.go
index 030919b1bc..219730ec47 100644
--- a/pkg/version.go
+++ b/pkg/version.go
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pkg // import "agones.dev/agones/pkg"
+package pkg
 
 var (
 	// Version is the global version for all binaries
 	// This is set at compile time by the build process
-	Version string = "dev"
+	Version = "dev"
 )