diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/core/certificate/package-info.java b/spring-credhub-core/src/main/java/org/springframework/credhub/core/certificate/package-info.java
new file mode 100644
index 0000000..d7edf38
--- /dev/null
+++ b/spring-credhub-core/src/main/java/org/springframework/credhub/core/certificate/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2017 the original author or authors.
+ *
+ * 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.
+ */
+
+/**
+ * Core API abstractions for certificate operations.
+ */
+package org.springframework.credhub.core.certificate;
\ No newline at end of file
diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/core/credential/package-info.java b/spring-credhub-core/src/main/java/org/springframework/credhub/core/credential/package-info.java
new file mode 100644
index 0000000..915986d
--- /dev/null
+++ b/spring-credhub-core/src/main/java/org/springframework/credhub/core/credential/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2017 the original author or authors.
+ *
+ * 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.
+ */
+
+/**
+ * Core API abstractions for credential operations.
+ */
+package org.springframework.credhub.core.credential;
\ No newline at end of file
diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/core/info/package-info.java b/spring-credhub-core/src/main/java/org/springframework/credhub/core/info/package-info.java
new file mode 100644
index 0000000..1e5eeef
--- /dev/null
+++ b/spring-credhub-core/src/main/java/org/springframework/credhub/core/info/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2017 the original author or authors.
+ *
+ * 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.
+ */
+
+/**
+ * Core API abstractions for informational operations.
+ */
+package org.springframework.credhub.core.info;
\ No newline at end of file
diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/core/interpolation/package-info.java b/spring-credhub-core/src/main/java/org/springframework/credhub/core/interpolation/package-info.java
new file mode 100644
index 0000000..2d83845
--- /dev/null
+++ b/spring-credhub-core/src/main/java/org/springframework/credhub/core/interpolation/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2017 the original author or authors.
+ *
+ * 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.
+ */
+
+/**
+ * Core API abstractions for interpolation operations.
+ */
+package org.springframework.credhub.core.interpolation;
\ No newline at end of file
diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/core/permission/package-info.java b/spring-credhub-core/src/main/java/org/springframework/credhub/core/permission/package-info.java
new file mode 100644
index 0000000..13498fc
--- /dev/null
+++ b/spring-credhub-core/src/main/java/org/springframework/credhub/core/permission/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2017 the original author or authors.
+ *
+ * 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.
+ */
+
+/**
+ * Core API abstractions for permission operations.
+ */
+package org.springframework.credhub.core.permission;
\ No newline at end of file
diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/info/package-info.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/info/package-info.java
new file mode 100644
index 0000000..d9a62ea
--- /dev/null
+++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/info/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2017 the original author or authors.
+ *
+ * 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.
+ */
+
+/**
+ * Java representations of CredHub server information.
+ */
+package org.springframework.credhub.support.info;
\ No newline at end of file
diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/support/utils/package-info.java b/spring-credhub-core/src/main/java/org/springframework/credhub/support/utils/package-info.java
new file mode 100644
index 0000000..f079a5f
--- /dev/null
+++ b/spring-credhub-core/src/main/java/org/springframework/credhub/support/utils/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2017 the original author or authors.
+ *
+ * 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.
+ */
+
+/**
+ * Internal CredHub utility classes.
+ */
+package org.springframework.credhub.support.utils;
\ No newline at end of file
diff --git a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/security/package-info.java b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/security/package-info.java
new file mode 100644
index 0000000..972bc96
--- /dev/null
+++ b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/security/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2017 the original author or authors.
+ *
+ * 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.
+ */
+
+/**
+ * Spring auto configuration support for Spring CredHub.
+ */
+package org.springframework.credhub.autoconfig.security;
\ No newline at end of file