diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformation.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformation.java
index 2c9baed8..1a172b34 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformation.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformation.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.gemfire.repository.query;
 
 import org.springframework.data.gemfire.mapping.GemfirePersistentEntity;
@@ -30,6 +29,7 @@ import org.springframework.data.repository.core.support.PersistentEntityInformat
  * @see org.springframework.data.gemfire.repository.query.GemfireEntityInformation
  * @see org.springframework.data.repository.core.support.PersistentEntityInformation
  */
+// TODO: Move to org.springframework.data.gemfire.repository.core.support
 public class DefaultGemfireEntityInformation<T, ID> extends PersistentEntityInformation<T, ID>
 		implements GemfireEntityInformation<T, ID> {
 
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java
index f823ac18..44bec7a7 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.gemfire.repository.query;
 
 import org.apache.geode.cache.Region;
@@ -26,6 +25,7 @@ import org.springframework.data.repository.core.EntityInformation;
  * @author Oliver Gierke
  * @see org.springframework.data.repository.core.EntityInformation
  */
+// TODO: Move to org.springframework.data.gemfire.repository.core
 public interface GemfireEntityInformation<T, ID> extends EntityInformation<T, ID> {
 
 	/**