From 7cc122aa74a9591a5ee7eb97ff51e876e2140167 Mon Sep 17 00:00:00 2001
From: Sebastian J <zeeman@zeeman.de>
Date: Sun, 12 May 2019 21:50:23 -0400
Subject: [PATCH 1/5] Cleanup

---
 .gitignore                                    |   3 +
 .travis.settings.xml                          |   2 +-
 .travis.yml                                   |   3 +
 README.md                                     |  14 +-
 pom.xml                                       | 529 ++++++++----------
 spring-data-dynamodb-boot/pom.xml             |  69 +++
 spring-data-dynamodb-cdi/pom.xml              |  52 ++
 spring-data-dynamodb-examples/README.md       | 112 ++++
 .../custom/README.md                          |  58 ++
 spring-data-dynamodb-examples/custom/pom.xml  |  66 +++
 .../custom/Application.java                   |  86 +++
 .../custom/CustomUserRepositoryMethods.java   |  20 +
 .../CustomUserRepositoryMethodsImpl.java      |  51 ++
 .../custom/DynamoDBConfig.java                |  56 ++
 .../custom/User.java                          |  85 +++
 .../custom/UserRepository.java                |  26 +
 .../src/main/resources/application.properties |   1 +
 .../multirepo/README.md                       |  74 +++
 .../multirepo/pom.xml                         |  67 +++
 .../multirepo/Application.java                | 104 ++++
 .../multirepo/Customer.java                   |  69 +++
 .../multirepo/CustomerRepository.java         |  26 +
 .../multirepo/Device.java                     |  95 ++++
 .../multirepo/DeviceKey.java                  |  60 ++
 .../multirepo/DeviceRepository.java           |  29 +
 .../multirepo/DynamoDBConfig.java             |  65 +++
 .../src/main/resources/application.properties |   6 +
 spring-data-dynamodb-examples/pom.xml         | 115 ++++
 spring-data-dynamodb-examples/rest/README.md  |  56 ++
 spring-data-dynamodb-examples/rest/pom.xml    |  80 +++
 .../rest/Application.java                     |  75 +++
 .../rest/DynamoDBConfig.java                  |  63 +++
 .../rest/User.java                            |  70 +++
 .../rest/UserRepository.java                  |  26 +
 .../src/main/resources/application.properties |   1 +
 .../simple/README.md                          | 104 ++++
 spring-data-dynamodb-examples/simple/pom.xml  |  72 +++
 .../simple/Application.java                   |  59 ++
 .../simple/DynamoDBConfig.java                |  46 ++
 .../simple/PagingUserRepository.java          |  38 ++
 .../simple/User.java                          |  93 +++
 .../simple/UserRepository.java                |  26 +
 .../src/main/resources/application.properties |   1 +
 .../simple/UserRepositoryIT.java              | 121 ++++
 spring-data-dynamodb/pom.xml                  | 121 ++++
 .../config/AbstractDynamoDBConfiguration.java |   2 +-
 .../data/dynamodb/config/BeanNames.java       |   2 +-
 .../DynamoDBAuditingBeanDefinitionParser.java |   2 +-
 .../config/DynamoDBAuditingRegistrar.java     |   2 +-
 .../config/EnableDynamoDBAuditing.java        |   2 +-
 .../dynamodb/core/DynamoDBOperations.java     |   2 +-
 .../data/dynamodb/core/DynamoDBTemplate.java  |   2 +-
 .../data/dynamodb/domain/UnpagedPageImpl.java |   2 +-
 .../exception/BatchDeleteException.java       |   2 +-
 .../exception/BatchWriteException.java        |   2 +-
 .../AbstractDynamoDBDateMarshaller.java       |   2 +-
 .../DefaultDynamoDBDateMarshaller.java        |   2 +-
 .../mapping/DynamoDBMappingContext.java       |   2 +-
 .../mapping/DynamoDBPersistentEntity.java     |   2 +-
 .../mapping/DynamoDBPersistentEntityImpl.java |   2 +-
 .../mapping/DynamoDBPersistentProperty.java   |   2 +-
 .../DynamoDBPersistentPropertyImpl.java       |   2 +-
 .../event/AbstractDynamoDBEventListener.java  |   2 +-
 .../mapping/event/AfterDeleteEvent.java       |   2 +-
 .../mapping/event/AfterLoadEvent.java         |   2 +-
 .../mapping/event/AfterQueryEvent.java        |   2 +-
 .../mapping/event/AfterSaveEvent.java         |   2 +-
 .../mapping/event/AfterScanEvent.java         |   2 +-
 .../mapping/event/AuditingEventListener.java  |   2 +-
 .../mapping/event/BeforeDeleteEvent.java      |   2 +-
 .../mapping/event/BeforeSaveEvent.java        |   2 +-
 .../mapping/event/DynamoDBMappingEvent.java   |   2 +-
 .../mapping/event/LoggingEventListener.java   |   2 +-
 .../ValidatingDynamoDBEventListener.java      |   2 +-
 .../Date2EpocheDynamoDBMarshaller.java        |   2 +-
 .../Date2IsoDynamoDBMarshaller.java           |   2 +-
 .../marshaller/DateDynamoDBMarshaller.java    |   2 +-
 .../Instant2EpocheDynamoDBMarshaller.java     |   2 +-
 .../Instant2IsoDynamoDBMarshaller.java        |   2 +-
 .../dynamodb/query/AbstractDynamicQuery.java  |   2 +-
 .../query/AbstractMultipleEntityQuery.java    |   2 +-
 .../data/dynamodb/query/AbstractQuery.java    |   2 +-
 .../query/AbstractSingleEntityQuery.java      |   2 +-
 .../query/CountByHashAndRangeKeyQuery.java    |   2 +-
 .../dynamodb/query/CountByHashKeyQuery.java   |   2 +-
 .../MultipleEntityQueryExpressionQuery.java   |   2 +-
 .../MultipleEntityQueryRequestQuery.java      |   2 +-
 .../MultipleEntityScanExpressionQuery.java    |   2 +-
 .../spring/data/dynamodb/query/Query.java     |   2 +-
 .../query/QueryExpressionCountQuery.java      |   2 +-
 .../query/QueryRequestCountQuery.java         |   2 +-
 .../query/ScanExpressionCountQuery.java       |   2 +-
 ...ingleEntityLoadByHashAndRangeKeyQuery.java |   2 +-
 .../query/SingleEntityLoadByHashKeyQuery.java |   2 +-
 .../data/dynamodb/query/StaticQuery.java      |   2 +-
 .../repository/DynamoDBCrudRepository.java    |   2 +-
 .../repository/DynamoDBHashAndRangeKey.java   |   2 +-
 .../DynamoDBPagingAndSortingRepository.java   |   2 +-
 .../data/dynamodb/repository/EnableScan.java  |   2 +-
 .../dynamodb/repository/EnableScanCount.java  |   2 +-
 .../data/dynamodb/repository/Query.java       |   2 +-
 .../dynamodb/repository/QueryConstants.java   |   2 +-
 .../cdi/DynamoDBRepositoryBean.java           |   2 +-
 .../cdi/DynamoDBRepositoryExtension.java      |   2 +-
 .../dynamodb/repository/cdi/package-info.java |   2 +-
 .../config/DynamoDBMapperConfigFactory.java   |  34 ++
 .../DynamoDBMapperConfigPostProcessor.java    |  31 +-
 .../config/DynamoDBMapperFactory.java         |  12 +-
 .../config/DynamoDBRepositoriesRegistrar.java |   2 +-
 .../DynamoDBRepositoryConfigExtension.java    |  90 ++-
 .../DynamoDBRepositoryNameSpaceHandler.java   |   2 +-
 .../config/EnableDynamoDBRepositories.java    |   2 +-
 .../query/AbstractDynamoDBQuery.java          |   2 +-
 .../query/AbstractDynamoDBQueryCreator.java   |   2 +-
 .../query/AbstractDynamoDBQueryCriteria.java  |   2 +-
 .../query/DynamoDBCountQueryCreator.java      |   2 +-
 ...moDBEntityWithHashAndRangeKeyCriteria.java |   2 +-
 ...DynamoDBEntityWithHashKeyOnlyCriteria.java |   2 +-
 .../query/DynamoDBQueryCreator.java           |   2 +-
 .../query/DynamoDBQueryCriteria.java          |   2 +-
 .../query/DynamoDBQueryLookupStrategy.java    |   2 +-
 .../repository/query/DynamoDBQueryMethod.java |   2 +-
 .../query/PartTreeDynamoDBQuery.java          |   2 +-
 .../CompositeIdHashAndRangeKeyExtractor.java  |   2 +-
 .../support/DynamoDBEntityInformation.java    |   2 +-
 .../DynamoDBEntityMetadataSupport.java        |   2 +-
 ...shAndRangeKeyExtractingEntityMetadata.java |   2 +-
 ...dRangeKeyExtractingEntityMetadataImpl.java |   2 +-
 ...ynamoDBHashAndRangeKeyMethodExtractor.java |   2 +-
 ...oDBHashAndRangeKeyMethodExtractorImpl.java |   2 +-
 ...namoDBHashKeyExtractingEntityMetadata.java |   2 +-
 ...BIdIsHashAndRangeKeyEntityInformation.java |   2 +-
 ...sHashAndRangeKeyEntityInformationImpl.java |   2 +-
 ...amoDBIdIsHashKeyEntityInformationImpl.java |   2 +-
 .../support/DynamoDBRepositoryFactory.java    |   2 +-
 .../DynamoDBRepositoryFactoryBean.java        |   2 +-
 .../EnableScanAnnotationPermissions.java      |   2 +-
 .../support/EnableScanPermissions.java        |   2 +-
 ...dAndGetterReflectionEntityInformation.java |   2 +-
 .../support/HashAndRangeKeyExtractor.java     |   2 +-
 .../repository/support/HashKeyExtractor.java  |   2 +-
 .../support/HashKeyIsIdHashKeyExtractor.java  |   2 +-
 .../support/SimpleDynamoDBCrudRepository.java |   2 +-
 ...pleDynamoDBPagingAndSortingRepository.java |   2 +-
 .../util/DynamoDBMappingContextProcessor.java |   2 +-
 .../dynamodb/repository/util/Entity2DDL.java  |   2 +-
 .../Entity2DynamoDBTableSynchronizer.java     |   2 +-
 .../EntityInformationProxyPostProcessor.java  |   2 +-
 .../data/dynamodb/utils/ExceptionHandler.java |   2 +-
 .../data/dynamodb/utils/SortHandler.java      |   2 +-
 .../javax.enterprise.inject.spi.Extension     |   0
 .../main/resources/META-INF/spring.handlers   |   0
 .../main/resources/META-INF/spring.schemas    |   0
 .../main/resources/META-INF/spring.tooling    |   0
 .../repository/config/spring-dynamodb-1.0.xsd |   0
 .../config/AuditingIntegrationTests.java      |   2 +-
 .../AuditingViaJavaConfigRepositoriesIT.java  |   2 +-
 ...amoDBAuditingBeanDefinitionParserTest.java |   2 +-
 .../DynamoDBAuditingRegistrarUnitTests.java   |   2 +-
 .../data/dynamodb/core/ConfigurationTI.java   |   2 +-
 .../data/dynamodb/core/CustomerHistoryIT.java |   6 +-
 .../dynamodb/core/DynamoDBTemplateIT.java     |   2 +-
 .../dynamodb/core/DynamoDBTemplateTest.java   |   2 +-
 .../spring/data/dynamodb/core/FeedUserIT.java |   2 +-
 .../data/dynamodb/core/SortPageableIT.java    |   2 +-
 .../dynamodb/domain/UnpagedPageImplTest.java  |   2 +-
 .../dynamodb/domain/sample/AuditableUser.java |   2 +-
 .../sample/AuditableUserRepository.java       |   2 +-
 .../domain/sample/CRUDOperationsIT.java       |   2 +-
 .../domain/sample/CustomerDocument.java       |   2 +-
 .../domain/sample/CustomerDocumentIT.java     |   6 +-
 .../domain/sample/CustomerDocumentId.java     |   2 +-
 .../sample/CustomerDocumentRepository.java    |   2 +-
 .../domain/sample/CustomerHistory.java        |   2 +-
 .../domain/sample/CustomerHistoryId.java      |   2 +-
 .../sample/CustomerHistoryRepository.java     |   2 +-
 .../domain/sample/DynamoDBYearMarshaller.java |   2 +-
 .../data/dynamodb/domain/sample/Feed.java     |   2 +-
 .../domain/sample/FeedPagingRepository.java   |   2 +-
 .../data/dynamodb/domain/sample/FeedUser.java |   2 +-
 .../domain/sample/FeedUserRepository.java     |   2 +-
 .../GlobalSecondaryIndexWithRangeKeyIT.java   |   2 +-
 .../domain/sample/HashRangeKeyIT.java         |   2 +-
 .../dynamodb/domain/sample/Installation.java  |   2 +-
 .../domain/sample/InstallationRepository.java |   2 +-
 .../data/dynamodb/domain/sample/Jdk8IT.java   |   2 +-
 .../data/dynamodb/domain/sample/Playlist.java |   2 +-
 .../dynamodb/domain/sample/PlaylistId.java    |   2 +-
 .../domain/sample/PlaylistRepository.java     |   2 +-
 .../data/dynamodb/domain/sample/User.java     |   2 +-
 .../sample/UserPaginationRepository.java      |   2 +-
 .../domain/sample/UserRepository.java         |   2 +-
 .../DefaultDynamoDBDateMarshallerTest.java    |   2 +-
 .../mapping/DynamoDBMappingContextTest.java   |   2 +-
 .../mapping/DynamoDBPersistentEntityTest.java |   2 +-
 ...ynamoDBPersistentPropertyImplUnitTest.java |   2 +-
 .../AbstractDynamoDBEventListenerTest.java    |   2 +-
 .../event/LoggingEventListenerTest.java       |   2 +-
 .../ValidatingDynamoDBEventListenerTest.java  |   2 +-
 .../Date2EpocheDynamoDBMarshallerTest.java    |   2 +-
 .../Date2IsoDynamoDBMarshallerTest.java       |   2 +-
 .../Instant2EpocheDynamoDBMarshallerTest.java |   2 +-
 .../Instant2IsoDynamoDBMarshallerTest.java    |   2 +-
 .../query/AbstractDynamicQueryTest.java       |   2 +-
 .../AbstractMultipleEntityQueryTest.java      |   2 +-
 .../query/AbstractSingleEntityQueryTest.java  |   2 +-
 .../CountByHashAndRangeKeyQueryTest.java      |   2 +-
 .../query/CountByHashKeyQueryTest.java        |   2 +-
 .../query/QueryExpressionCountQueryTest.java  |   2 +-
 .../query/QueryRequestCountQueryTest.java     |   2 +-
 .../query/ScanExpressionCountQueryTest.java   |   2 +-
 .../DynamoDBHashAndRangeKeyTest.java          |   2 +-
 .../cdi/DynamoDBRepositoryBeanTest.java       |   2 +-
 ...DynamoDBMapperConfigPostProcessorTest.java |   8 +-
 ...AbstractDynamoDBQueryCriteriaUnitTest.java |   2 +-
 .../query/AbstractDynamoDBQueryTest.java      |   2 +-
 .../query/CaseChangingMarshaller.java         |   2 +-
 ...tyWithHashAndRangeKeyCriteriaUnitTest.java |   2 +-
 ...EntityWithHashKeyOnlyCriteriaUnitTest.java |   2 +-
 .../DynamoDBQueryLookupStrategyTest.java      |   2 +-
 .../query/PartTreeDynamoDBQueryUnitTest.java  |   2 +-
 ...DynamoDBEntityMetadataSupportUnitTest.java |   2 +-
 ...ndRangeKeyMethodExtractorImplUnitTest.java |   2 +-
 ...RangeKeyEntityInformationImplUnitTest.java |   2 +-
 ...sHashKeyEntityInformationImplUnitTest.java |   2 +-
 .../DynamoDBRepositoryFactoryBeanTest.java    |   2 +-
 .../DynamoDBRepositoryFactoryTest.java        |   2 +-
 .../EnableScanAnnotationPermissionTest.java   |   2 +-
 .../SimpleDynamoDBCrudRepositoryTest.java     |   2 +-
 ...oDBPagingAndSortingRepositoryUnitTest.java |   2 +-
 .../repository/util/Entity2DDLTest.java       |   2 +-
 .../Entity2DynamoDBTableSynchronizerTest.java |   2 +-
 .../dynamodb/utils/DynamoDBLocalResource.java |   2 +-
 .../data/dynamodb/utils/DynamoDBResource.java |   2 +-
 .../dynamodb/utils/ExceptionHandlerTest.java  |   2 +-
 .../data/dynamodb/utils/SortHandlerTest.java  |   2 +-
 .../context/HashRangeKeyIT-context.xml        |   0
 .../src}/test/resources/logback.xml           |  10 +-
 .../org.mockito.plugins.MockMaker             |   0
 .../spring/data/dynamodb/config/auditing.xml  |   0
 .../src}/test/resources/slf4jtest.properties  |   0
 src/changes/changes.xml                       |   2 +-
 src/checkstyle.xml                            |   2 +-
 src/pmd.xml                                   |   2 +-
 src/site/site.xml                             |   2 +-
 src/spotbugs-exclude.xml                      |   2 +-
 246 files changed, 3011 insertions(+), 549 deletions(-)
 create mode 100644 spring-data-dynamodb-boot/pom.xml
 create mode 100644 spring-data-dynamodb-cdi/pom.xml
 create mode 100644 spring-data-dynamodb-examples/README.md
 create mode 100644 spring-data-dynamodb-examples/custom/README.md
 create mode 100644 spring-data-dynamodb-examples/custom/pom.xml
 create mode 100644 spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/Application.java
 create mode 100644 spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethods.java
 create mode 100644 spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethodsImpl.java
 create mode 100644 spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/DynamoDBConfig.java
 create mode 100644 spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/User.java
 create mode 100644 spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/UserRepository.java
 create mode 100644 spring-data-dynamodb-examples/custom/src/main/resources/application.properties
 create mode 100644 spring-data-dynamodb-examples/multirepo/README.md
 create mode 100644 spring-data-dynamodb-examples/multirepo/pom.xml
 create mode 100644 spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Application.java
 create mode 100644 spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Customer.java
 create mode 100644 spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/CustomerRepository.java
 create mode 100644 spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Device.java
 create mode 100644 spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DeviceKey.java
 create mode 100644 spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DeviceRepository.java
 create mode 100644 spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DynamoDBConfig.java
 create mode 100644 spring-data-dynamodb-examples/multirepo/src/main/resources/application.properties
 create mode 100644 spring-data-dynamodb-examples/pom.xml
 create mode 100644 spring-data-dynamodb-examples/rest/README.md
 create mode 100644 spring-data-dynamodb-examples/rest/pom.xml
 create mode 100644 spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/Application.java
 create mode 100644 spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/DynamoDBConfig.java
 create mode 100644 spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/User.java
 create mode 100644 spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/UserRepository.java
 create mode 100644 spring-data-dynamodb-examples/rest/src/main/resources/application.properties
 create mode 100644 spring-data-dynamodb-examples/simple/README.md
 create mode 100644 spring-data-dynamodb-examples/simple/pom.xml
 create mode 100644 spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/Application.java
 create mode 100644 spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/DynamoDBConfig.java
 create mode 100644 spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/PagingUserRepository.java
 create mode 100644 spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/User.java
 create mode 100644 spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepository.java
 create mode 100644 spring-data-dynamodb-examples/simple/src/main/resources/application.properties
 create mode 100644 spring-data-dynamodb-examples/simple/src/test/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepositoryIT.java
 create mode 100755 spring-data-dynamodb/pom.xml
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/config/AbstractDynamoDBConfiguration.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/config/BeanNames.java (94%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParser.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrar.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/config/EnableDynamoDBAuditing.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBOperations.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplate.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImpl.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchDeleteException.java (94%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchWriteException.java (94%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/AbstractDynamoDBDateMarshaller.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshaller.java (96%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContext.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntity.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityImpl.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentProperty.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImpl.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListener.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterDeleteEvent.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterLoadEvent.java (94%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterQueryEvent.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterSaveEvent.java (94%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterScanEvent.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AuditingEventListener.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeDeleteEvent.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeSaveEvent.java (94%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/DynamoDBMappingEvent.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListener.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListener.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshaller.java (96%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshaller.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/marshaller/DateDynamoDBMarshaller.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshaller.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshaller.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQuery.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQuery.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractQuery.java (96%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQuery.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQuery.java (96%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQuery.java (96%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryExpressionQuery.java (96%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryRequestQuery.java (96%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityScanExpressionQuery.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/query/Query.java (96%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQuery.java (96%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQuery.java (96%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQuery.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashAndRangeKeyQuery.java (96%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashKeyQuery.java (96%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/query/StaticQuery.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBCrudRepository.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKey.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBPagingAndSortingRepository.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScan.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScanCount.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/QueryConstants.java (94%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBean.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryExtension.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/package-info.java (93%)
 create mode 100644 spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactory.java
 rename src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactory.java => spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigPostProcessor.java (69%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperFactory.java (89%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoriesRegistrar.java (96%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java (76%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryNameSpaceHandler.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/config/EnableDynamoDBRepositories.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQuery.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCreator.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteria.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBCountQueryCreator.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteria.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteria.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCreator.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCriteria.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategy.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryMethod.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQuery.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/CompositeIdHashAndRangeKeyExtractor.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityInformation.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupport.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadata.java (96%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadataImpl.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractor.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImpl.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashKeyExtractingEntityMetadata.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformation.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImpl.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImpl.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactory.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBean.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissions.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanPermissions.java (95%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/FieldAndGetterReflectionEntityInformation.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashAndRangeKeyExtractor.java (94%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyExtractor.java (94%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyIsIdHashKeyExtractor.java (96%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepository.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepository.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/util/DynamoDBMappingContextProcessor.java (96%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDL.java (98%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizer.java (99%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/repository/util/EntityInformationProxyPostProcessor.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandler.java (97%)
 rename {src => spring-data-dynamodb/src}/main/java/org/socialsignin/spring/data/dynamodb/utils/SortHandler.java (97%)
 rename {src => spring-data-dynamodb/src}/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (100%)
 rename {src => spring-data-dynamodb/src}/main/resources/META-INF/spring.handlers (100%)
 rename {src => spring-data-dynamodb/src}/main/resources/META-INF/spring.schemas (100%)
 rename {src => spring-data-dynamodb/src}/main/resources/META-INF/spring.tooling (100%)
 rename {src => spring-data-dynamodb/src}/main/resources/org/socialsignin/spring/data/dynamodb/repository/config/spring-dynamodb-1.0.xsd (100%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingIntegrationTests.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingViaJavaConfigRepositoriesIT.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParserTest.java (99%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrarUnitTests.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/core/ConfigurationTI.java (95%)
 rename src/test/java/org/socialsignin/spring/data/dynamodb/core/CustomerHistoryTest.java => spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/CustomerHistoryIT.java (93%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateIT.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateTest.java (99%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/core/FeedUserIT.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/core/SortPageableIT.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImplTest.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUser.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUserRepository.java (94%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CRUDOperationsIT.java (99%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocument.java (98%)
 rename src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentTest.java => spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentIT.java (93%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentId.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentRepository.java (96%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistory.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryId.java (96%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryRepository.java (94%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/DynamoDBYearMarshaller.java (95%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Feed.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedPagingRepository.java (96%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUser.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUserRepository.java (95%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/GlobalSecondaryIndexWithRangeKeyIT.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/HashRangeKeyIT.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Installation.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/InstallationRepository.java (95%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Jdk8IT.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Playlist.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistId.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistRepository.java (94%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/User.java (99%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserPaginationRepository.java (96%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshallerTest.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContextTest.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityTest.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImplUnitTest.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListenerTest.java (99%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListenerTest.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListenerTest.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshallerTest.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshallerTest.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshallerTest.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshallerTest.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQueryTest.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQueryTest.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQueryTest.java (96%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQueryTest.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQueryTest.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQueryTest.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQueryTest.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQueryTest.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKeyTest.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBeanTest.java (98%)
 rename src/test/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactoryTest.java => spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigPostProcessorTest.java (94%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteriaUnitTest.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryTest.java (99%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/query/CaseChangingMarshaller.java (95%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteriaUnitTest.java (99%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteriaUnitTest.java (99%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategyTest.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQueryUnitTest.java (99%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupportUnitTest.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImplUnitTest.java (99%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImplUnitTest.java (99%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImplUnitTest.java (99%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBeanTest.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryTest.java (96%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissionTest.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepositoryTest.java (99%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepositoryUnitTest.java (98%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDLTest.java (96%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizerTest.java (99%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBLocalResource.java (96%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBResource.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandlerTest.java (97%)
 rename {src => spring-data-dynamodb/src}/test/java/org/socialsignin/spring/data/dynamodb/utils/SortHandlerTest.java (97%)
 rename {src => spring-data-dynamodb/src}/test/resources/META-INF/context/HashRangeKeyIT-context.xml (100%)
 rename {src => spring-data-dynamodb/src}/test/resources/logback.xml (53%)
 rename {src => spring-data-dynamodb/src}/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%)
 rename {src => spring-data-dynamodb/src}/test/resources/org/socialsignin/spring/data/dynamodb/config/auditing.xml (100%)
 rename {src => spring-data-dynamodb/src}/test/resources/slf4jtest.properties (100%)

diff --git a/.gitignore b/.gitignore
index 8ffff15b..83bbf2cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,9 @@ target
 pom.xml.releaseBackup
 release.properties
 
+spring-data-dynamodb-examples/src/main/resources/application.properties
+
+
 # Package Files #
 *.jar
 *.war
diff --git a/.travis.settings.xml b/.travis.settings.xml
index 1e4a183a..3dbc4599 100644
--- a/.travis.settings.xml
+++ b/.travis.settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+    Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/.travis.yml b/.travis.yml
index ee641f57..a0ec6b8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,9 @@ jdk:
   - oraclejdk8
   - oraclejdk9
 
+env:
+  - TRAVIS_CI=true
+
 before_script:
   - pip install --user codecov
 
diff --git a/README.md b/README.md
index c5180528..aabad8cb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![codecov.io](https://codecov.io/github/derjust/spring-data-dynamodb/coverage.svg?branch=master)](https://codecov.io/github/derjust/spring-data-dynamodb?branch=master) [![Build Status](https://travis-ci.org/derjust/spring-data-dynamodb.svg?branch=master)](https://travis-ci.org/derjust/spring-data-dynamodb) 
+[![codecov.io](https://codecov.io/github/derjust/spring-data-dynamodb/coverage.svg?branch=master)](https://codecov.io/github/derjust/spring-data-dynamodb?branch=master) [![Build Status](https://travis-ci.org/derjust/spring-data-dynamodb.svg?branch=master)](https://travis-ci.org/derjust/spring-data-dynamodb)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.derjust/spring-data-dynamodb/badge.svg)](https://search.maven.org/search?q=g:com.github.derjust)
 [![Developer Workspace](https://codenvy.io/factory/resources/codenvy-contribute.svg)](https://codenvy.io/f?user=userrzonfqnofgrmfxjx&amp;name=spring-data-dynamodb)
 [![Donation badge](https://img.shields.io/badge/Donate-%F0%9F%92%B8-DAA520.svg)](DONATION.md)
@@ -22,12 +22,12 @@ Technical infos can be found on the [project page](https://derjust.github.io/spr
 * [Projections](https://github.com/derjust/spring-data-dynamodb/wiki/Projections)
 * Possibility to integrate [custom repository code](https://github.com/derjust/spring-data-dynamodb/wiki/Custom-repository-implementations)
 * Easy Spring annotation based integration
-* [REST support](https://github.com/derjust/spring-data-dynamodb-examples/blob/master/README-rest.md) via [spring-data-rest](https://projects.spring.io/spring-data-rest/)
+* [REST support](spring-data-dynamodb-examples/rest/README.md) via [spring-data-rest](https://projects.spring.io/spring-data-rest/)
 
 ## Demo application ##
 
 For a demo of spring-data-dynamodb, using spring-data-rest to showcase DynamoDB repositories exposed with REST,
-please see [spring-data-dynamodb-examples](https://github.com/derjust/spring-data-dynamodb-examples).
+please see [spring-data-dynamodb-examples](spring-data-dynamodb-examples/).
 
 ## Quick Start ##
 
@@ -147,10 +147,10 @@ public static class DynamoDBConfig {
 And finally write a test client [UserRepositoryIT](https://github.com/derjust/spring-data-dynamodb-examples/blob/master/src/test/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepositoryIT.java) or start calling it from your existing Spring code.
 
 
-The full source code is available at [spring-data-dynamodb-examples' simple example](https://github.com/derjust/spring-data-dynamodb-examples/blob/master/README-simple.md)
+The full source code is available at [spring-data-dynamodb-examples' simple example](spring-data-dynamodb-examples/simple/README.md)
 
 ## More
-More sample code can be found in the [spring-data-dynamodb-examples](https://github.com/derjust/spring-data-dynamodb-examples) project.
+More sample code can be found in the [spring-data-dynamodb-examples](spring-data-dynamodb-examples/simple/) project.
 
 Advanced topics can be found in the [wiki](https://github.com/derjust/spring-data-dynamodb/wiki).
 
@@ -172,13 +172,13 @@ API changes will follow SEMVER and loosly the Spring Framework releases.
 | 5.1.x                           | >= 2.1                         | >= 5.1                         | Lovelace-SR1              |
 `spring-data-dynamodb` depends directly on `spring-data` as also `spring-context`, `spring-data` and `spring-tx`.
 
-`compile` and `runtime` dependencies are kept to a minimum to allow easy integartion, for example into 
+`compile` and `runtime` dependencies are kept to a minimum to allow easy integartion, for example into
 Spring-Boot projects.
 
 ## History
 The code base has some history already in it - let's clarify it a bit:
 * The code base was established under [github.com/michaellavelle/spring-data-dynamodb)](https://github.com/michaellavelle/spring-data-dynamodb)
-* It was forked and further maintained under [github.com/derjust/spring-data-dynamodb)](https://github.com/derjust/spring-data-dynamodb) 
+* It was forked and further maintained under [github.com/derjust/spring-data-dynamodb)](https://github.com/derjust/spring-data-dynamodb)
     * Available in Maven Central under [`com.github.derjust:spring-data-dynamodb`](http://central.maven.org/maven2/com/github/derjust/spring-data-dynamodb/)
 
 The Java package name/XSD namespace never changed from `org.socialsignin.spring.data.dynamodb`.
diff --git a/pom.xml b/pom.xml
index 3995eb0e..b6507f39 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+    Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -19,9 +19,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.derjust</groupId>
-    <artifactId>spring-data-dynamodb</artifactId>
+    <artifactId>spring-data-dynamodb-parent</artifactId>
+    <packaging>pom</packaging>
     <version>5.1.1-SNAPSHOT</version>
-    <name>Spring Data DynamoDB</name>
+    <name>Spring Data DynamoDB Parent</name>
     <inceptionYear>2018</inceptionYear>
 
     <description>The primary goal of the Spring® Data project is to make it easier to build Spring-powered applications
@@ -39,6 +40,7 @@
     <properties>
         <spring.version>5.1.2.RELEASE</spring.version>
         <spring-data.version>2.1.2.RELEASE</spring-data.version>
+        <spring-boot.version>2.0.3.RELEASE</spring-boot.version>
 
         <hibernate-validator.version>6.0.9.Final</hibernate-validator.version>
         <aws-java-sdk.version>1.11.515</aws-java-sdk.version>
@@ -47,6 +49,7 @@
         <cdi.version>1.2</cdi.version>
         <slf4j-test.version>1.2.0</slf4j-test.version>
         <sqlite4java.version>1.0.392</sqlite4java.version>
+        <logback-colorizer.version>1.0.1</logback-colorizer.version>
 
         <findbugs.version>3.0.5</findbugs.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -112,6 +115,11 @@
                 <artifactId>slf4j-test</artifactId>
                 <version>${slf4j-test.version}</version>
             </dependency>
+                <dependency>
+        <groupId>org.tuxdude.logback.extensions</groupId>
+        <artifactId>logback-colorizer</artifactId>
+        <version>${logback-colorizer.version}</version>
+    </dependency>
 
             <!-- AWS SDK comes with dependencies to 1.2 and 1.1.3 therefore locking down on 1.2 -->
             <dependency>
@@ -134,86 +142,11 @@
         </dependencies>
     </dependencyManagement>
 
-    <dependencies>
-        <!-- SPRING -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-        </dependency>
-
-        <!-- SPRING DATA -->
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-commons</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.hibernate.validator</groupId>
-            <artifactId>hibernate-validator</artifactId>
-        </dependency>
-
-        <!-- DynamoDB -->
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-dynamodb</artifactId>
-        </dependency>
-
-        <!-- CDI -->
-        <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <version>${cdi.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- TEST -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>DynamoDBLocal</artifactId>
-            <scope>test</scope>
-       </dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-to-slf4j</artifactId>
-			<scope>test</scope>
-		</dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>uk.org.lidalia</groupId>
-            <artifactId>slf4j-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>net.revelc.code.formatter</groupId>
-                    <artifactId>formatter-maven-plugin</artifactId>
-                    <version>2.7.2</version>
-                    <configuration>
-                        <lineEnding>LF</lineEnding>
-                    </configuration>
-                </plugin>
+
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
@@ -233,121 +166,188 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.0.2</version>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            </manifest>
+                            <manifestEntries>
+                                <Specification-Title>Spring Data</Specification-Title>
+                                <Specification-Version>2.1</Specification-Version>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
                     <version>1.10</version>
                 </plugin>
-                <plugin>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.17</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.19</version>
-                </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.1</version>
+                    <configuration>
+                        <compilerArgs>
+                            <compilerArg>-Xlint:unchecked</compilerArg>
+                            <compilerArg>-Xlint:deprecation</compilerArg>
+                        </compilerArgs>
+                    </configuration>
                 </plugin>
                 <plugin>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.20.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.0.2</version>
+                    <groupId>net.revelc.code.formatter</groupId>
+                    <artifactId>formatter-maven-plugin</artifactId>
+                    <version>2.7.2</version>
+                    <configuration>
+                        <lineEnding>LF</lineEnding>
+                        <configFile>${project.basedir}/eclipse-formatter-config.xml</configFile>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <?m2e execute onIncremental?>
+                            <phase>process-resources</phase>
+                            <goals>
+                                <goal>format</goal>
+                            </goals>
+                        </execution>
+                    </executions>
                 </plugin>
-                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
                 <plugin>
-                	<groupId>org.eclipse.m2e</groupId>
-                	<artifactId>lifecycle-mapping</artifactId>
-                	<version>1.0.0</version>
-                	<configuration>
-                		<lifecycleMappingMetadata>
-                			<pluginExecutions>
-                				<pluginExecution>
-                					<pluginExecutionFilter>
-                						<groupId>
-                							net.revelc.code.formatter
-                						</groupId>
-                						<artifactId>
-                							formatter-maven-plugin
-                						</artifactId>
-                						<versionRange>
-                							[2.7.2,)
-                						</versionRange>
-                						<goals>
-                							<goal>validate</goal>
-                						</goals>
-                					</pluginExecutionFilter>
-                					<action>
-                					<execute>
-                					<runOnIncremental>true</runOnIncremental>
-                					</execute>
-                					</action>
-                				</pluginExecution>
-                			</pluginExecutions>
-                		</lifecycleMappingMetadata>
-                	</configuration>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>2.17</version>
+                    <executions>
+                        <execution>
+                            <id>verify-style</id>
+                            <phase>validate</phase>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <logViolationsToConsole>true</logViolationsToConsole>
+                        <configLocation>${project.basedir}/checkstyle.xml</configLocation>
+                    </configuration>
                 </plugin>
+    			<plugin>
+    				<groupId>com.github.spotbugs</groupId>
+    				<artifactId>spotbugs-maven-plugin</artifactId>
+    				<version>3.1.5</version>
+    				<configuration>
+    					<effort>Max</effort>
+    					<!-- Reports all bugs (other values are medium and max) -->
+    					<threshold>Max</threshold>
+    					<!-- Produces XML report <xmlOutput>true</xmlOutput> -->
+    					<excludeFilterFile>src/spotbugs-exclude.xml</excludeFilterFile>
+    				</configuration>
+    				<executions>
+    					<execution>
+    						<phase>verify</phase>
+    						<goals>
+    							<goal>check</goal>
+    						</goals>
+    					</execution>
+    				</executions>
+    			</plugin>
+
+                      <plugin>
+                          <groupId>com.mycila</groupId>
+                          <artifactId>license-maven-plugin</artifactId>
+                          <version>3.0</version>
+                          <configuration>
+                              <header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
+                              <properties>
+                                  <owner>${project.artifactId}</owner>
+                                  <email>${project.url}</email>
+                              </properties>
+                              <excludes>
+                                  <exclude>**/README.md</exclude>
+                                  <exclude>**/DONATION.md</exclude>
+                                  <exclude>**/CONTRIBUTING.md</exclude>
+                                  <exclude>**/LICENSE</exclude>
+                                  <exclude>src/test/resources/**</exclude>
+                                  <exclude>src/main/resources/**</exclude>
+                                  <exclude>**/*.psd</exclude>
+                                  <exclude>src/eclipse-java-google-style.xml</exclude>
+                              </excludes>
+                          </configuration>
+                          <executions>
+                              <execution>
+                                  <goals>
+                                      <goal>format</goal>
+                                  </goals>
+                                  <phase>validate</phase>
+                              </execution>
+                          </executions>
+                      </plugin>
+
+                      <plugin>
+                          <groupId>org.apache.maven.plugins</groupId>
+                          <artifactId>maven-dependency-plugin</artifactId>
+                          <executions>
+                              <execution>
+                                  <!-- Prepare SQLite for in-memory DynamoDB instance (Unit testing) -->
+                                  <id>copy</id>
+                                  <phase>test-compile</phase>
+                                  <goals>
+                                      <goal>copy</goal>
+                                  </goals>
+                                  <configuration>
+                                      <artifactItems>
+                                          <artifactItem>
+                                              <groupId>com.almworks.sqlite4java</groupId>
+                                              <artifactId>${sqlite4java.artifactId}</artifactId>
+                                              <version>${sqlite4java.version}</version>
+                                              <type>${sqlite4java.type}</type>
+                                              <overWrite>true</overWrite>
+                                              <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                                          </artifactItem>
+                                      </artifactItems>
+                                  </configuration>
+                              </execution>
+                          </executions>
+                      </plugin>
+                      <plugin>
+                          <groupId>org.apache.maven.plugins</groupId>
+                          <artifactId>maven-surefire-plugin</artifactId>
+                          <version>2.20.1</version>
+                          <configuration>
+                              <systemProperties>
+                                  <property>
+                                      <name>sqlite4java.library.path</name>
+                                      <value>${project.build.directory}/lib</value>
+                                  </property>
+                              </systemProperties>
+                          </configuration>
+                      </plugin>
+                      <plugin>
+                          <groupId>org.apache.maven.plugins</groupId>
+                          <artifactId>maven-failsafe-plugin</artifactId>
+                          <version>2.19</version>
+                          <configuration>
+                              <systemPropertyVariables>
+                                  <sqlite4java.library.path>${project.build.directory}/lib</sqlite4java.library.path>
+                                  <dynamodb.port>${dynamodblocal.port}</dynamodb.port>
+                              </systemPropertyVariables>
+                          </configuration>
+                          <executions>
+                              <execution>
+                                  <id>integration-test</id>
+                                  <goals>
+                                      <goal>integration-test</goal>
+                                      <goal>verify</goal>
+                                  </goals>
+                              </execution>
+                          </executions>
+                      </plugin>
             </plugins>
+
         </pluginManagement>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                        </manifest>
-                        <manifestEntries>
-                            <Specification-Title>Spring Data</Specification-Title>
-                            <Specification-Version>2.1</Specification-Version>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <compilerArgs>
-                        <compilerArg>-Xlint:unchecked</compilerArg>
-                        <compilerArg>-Xlint:deprecation</compilerArg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
-                    <properties>
-                        <owner>${project.artifactId}</owner>
-                        <email>${project.url}</email>
-                    </properties>
-                    <excludes>
-                        <exclude>**/README.md</exclude>
-                        <exclude>**/DONATION.md</exclude>
-                        <exclude>**/CONTRIBUTING.md</exclude>
-                        <exclude>**/LICENSE</exclude>
-                        <exclude>src/test/resources/**</exclude>
-                        <exclude>src/main/resources/**</exclude>
-                        <exclude>**/*.psd</exclude>
-                        <exclude>src/eclipse-java-google-style.xml</exclude>
-                    </excludes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <phase>validate</phase>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -377,7 +377,7 @@
                         </goals>
                     </execution>
                     <execution>
-                        <id>default-check</id>
+                        <id>check</id>
                             <phase>test</phase>
                             <goals>
                                 <goal>check</goal>
@@ -404,57 +404,7 @@
                         </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>net.revelc.code.formatter</groupId>
-                <artifactId>formatter-maven-plugin</artifactId>
-                <configuration>
-                    <configFile>${project.basedir}/eclipse-formatter-config.xml</configFile>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>validate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>verify-style</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <logViolationsToConsole>true</logViolationsToConsole>
-                    <configLocation>src/checkstyle.xml</configLocation>
-                </configuration>
-            </plugin>
-			<plugin>
-				<groupId>com.github.spotbugs</groupId>
-				<artifactId>spotbugs-maven-plugin</artifactId>
-				<version>3.1.5</version>
-				<configuration>
-					<effort>Max</effort>
-					<!-- Reports all bugs (other values are medium and max) -->
-					<threshold>Max</threshold>
-					<!-- Produces XML report <xmlOutput>true</xmlOutput> -->
-					<excludeFilterFile>src/spotbugs-exclude.xml</excludeFilterFile>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>verify</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
@@ -474,63 +424,6 @@
                     </dependency>
                 </dependencies>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <!-- Prepare SQLite for in-memory DynamoDB instance (Unit testing) -->
-                        <id>copy</id>
-                        <phase>test-compile</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>com.almworks.sqlite4java</groupId>
-                                    <artifactId>${sqlite4java.artifactId}</artifactId>
-                                    <version>${sqlite4java.version}</version>
-                                    <type>${sqlite4java.type}</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>sqlite4java.library.path</name>
-                            <value>${project.build.directory}/lib</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <configuration>
-                    <systemPropertyVariables>
-                        <sqlite4java.library.path>${project.build.directory}/lib</sqlite4java.library.path>
-                        <dynamodb.port>${dynamodblocal.port}</dynamodb.port>
-                    </systemPropertyVariables>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>integration-test</id>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
@@ -543,20 +436,47 @@
 
     <repositories>
         <repository>
-            <id>spring-libs-snapshot</id>
-            <url>http://repo.springsource.org/libs-snapshot</url>
+            <id>spring-snapshot</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/libs-snapshot</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>spring-releases</id>
+            <name>Spring Releases</name>
+            <url>https://repo.spring.io/libs-release</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
         </repository>
         <repository>
             <id>dynamodb-local-oregon</id>
             <name>DynamoDB Local Release Repository</name>
             <url>https://s3-us-west-2.amazonaws.com/dynamodb-local/release</url>
         </repository>
+        <repository>
+            <id>org.jboss.repository.releases</id>
+            <name>JBoss Maven Release Repository</name>
+            <url>https://repository.jboss.org/nexus/content/repositories/releases</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
     </repositories>
 
     <pluginRepositories>
         <pluginRepository>
-            <id>com.springsource.repository.bundles.release</id>
-            <url>http://repository.springsource.com/maven/bundles/release</url>
+            <id>spring-releases</id>
+            <name>Spring Releases</name>
+            <url>https://repo.spring.io/libs-release</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
@@ -628,6 +548,15 @@
                 <sqlite4java.type>dll</sqlite4java.type>
             </properties>
         </profile>
+        <profile>
+            <!-- Profile that is activated for the TravisCI build. Aka where there are no local resources -->
+            <id>ci</id>
+            <activation>
+                <property>
+                    <name>!TRAVIS_CI</name>
+                </property>
+            </activation>
+        </profile>
         <profile>
             <id>release</id>
             <build>
@@ -846,9 +775,17 @@
                 <artifactId>findbugs-maven-plugin</artifactId>
                 <version>${findbugs.version}</version>
                 <configuration>
+                    <!-- 2.5.2
+                        Enables analysis which takes more memory but finds more bugs.
+                        If you run out of memory, changes the value of the effort element
+                        to 'Low'.
+                    -->
                     <effort>Max</effort>
                     <!-- Reports all bugs (other values are medium and max) -->
-                    <threshold>Low</threshold>
+                    <threshold>Max</threshold>
+                    <!-- Produces XML report -->
+                    <xmlOutput>true</xmlOutput>
+                    <findbugsXmlOutputDirectory>${project.build.directory}/findbugs</findbugsXmlOutputDirectory>
                 </configuration>
             </plugin>
             <plugin>
@@ -880,5 +817,11 @@
         </plugins>
     </reporting>
 
+    <modules>
+        <module>spring-data-dynamodb</module>
+        <module>spring-data-dynamodb-boot</module>
+        <module>spring-data-dynamodb-cdi</module>
+        <module>spring-data-dynamodb-examples</module>
+    </modules>
 
 </project>
diff --git a/spring-data-dynamodb-boot/pom.xml b/spring-data-dynamodb-boot/pom.xml
new file mode 100644
index 00000000..997b280b
--- /dev/null
+++ b/spring-data-dynamodb-boot/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright © 2018 spring-data-dynamodb-boot (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-boot)
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.github.derjust</groupId>
+        <artifactId>spring-data-dynamodb-parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>spring-data-dynamodb-boot</artifactId>
+    <name>Spring Boot for DynamoDB</name>
+
+	<!-- Just a project stub - not used right now -->
+
+    <properties>
+      <maven.compiler.source>1.9</maven.compiler.source>
+      <maven.compiler.target>1.9</maven.compiler.target>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+           </dependency>
+       </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.github.derjust</groupId>
+            <artifactId>spring-data-dynamodb</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/spring-data-dynamodb-cdi/pom.xml b/spring-data-dynamodb-cdi/pom.xml
new file mode 100644
index 00000000..13caa0dd
--- /dev/null
+++ b/spring-data-dynamodb-cdi/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright © 2018 spring-data-dynamodb-cdi (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-cdi)
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.github.derjust</groupId>
+        <artifactId>spring-data-dynamodb-parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>spring-data-dynamodb-cdi</artifactId>
+    <name>Spring Data DynamoDB - CDI</name>
+
+	<!-- Just a project stub - not used right now -->
+
+    <dependencies>
+        <dependency>
+            <groupId>com.github.derjust</groupId>
+            <artifactId>spring-data-dynamodb</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/spring-data-dynamodb-examples/README.md b/spring-data-dynamodb-examples/README.md
new file mode 100644
index 00000000..308498a4
--- /dev/null
+++ b/spring-data-dynamodb-examples/README.md
@@ -0,0 +1,112 @@
+# 📚 Spring Data DynamoDB Examples
+
+Examples for Spring-Data-DynamoDB available at [<img width="16" src="https://derjust.github.io/spring-data-dynamodb/banner/spring-data-dynamodb.png" />github.com/derjust/spring-data-dynamodb](https://github.com/derjust/spring-data-dynamodb)
+
+Please also check the [📖 Wiki](https://github.com/derjust/spring-data-dynamodb/wiki)
+
+The following examples exist and how they can be executed
+
+## 🚀 Simple Repository
+
+This example show the most basic usage also referenced by the [README.md](https://github.com/derjust/spring-data-dynamodb/) of the main project.
+
+Further explanation can be found 
+* in the [simple/README.md](simple/README.md)
+* as also the [code](simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple)
+
+## 📗 Multi Repository
+
+This example shows how to use multiple *Spring Data* repository types to access different storage backend. 
+
+In this example `DynamoDB` and `JPA-H2` is used.
+
+Further explanation can be found 
+* in the [multirepo/README.md](multirepo/README.md)
+* as also the [code](multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo)
+
+### 📜 Code sample
+The respective repository providers must be informed which interface to take care of. 
+In a `@Configurable` bean the interfaces have to be assigned via `include`/`exclude` filters:
+
+```java
+@SpringBootApplication
+@EnableJpaRepositories(
+  includeFilters = {
+    @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {
+      CustomerRepository.class}
+  )}
+)
+@EnableDynamoDBRepositories(
+  includeFilters = {
+    @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {
+      DeviceRepository.class}
+  )}
+)
+@Configuration
+public class Application {
+```
+
+## 📕 Custom repository methods
+
+This example shows how to use custom methods as part of *Spring Data* repository interfaces to implement custom logic.
+
+Further explanation can be found 
+* in the [custom/README.md](custom/README.md)
+* as also the [code](custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom)
+
+
+### 📜 Code sample
+The repository interface is extend by an additional interface. It's implementation is found by the `Impl` suffix in the same package.
+*Spring Data* itself takes care of weaving in the implementation at runtime:
+
+```java
+public interface UserRepository extends CrudRepository<User, Long>, CustomUserRepositoryMethods { }
+
+
+public interface CustomUserRepositoryMethods {
+    User calculateAge(User user);
+}
+
+
+public class CustomUserRepositoryMethodsImpl implements CustomUserRepositoryMethods {
+
+    @Override
+    public User calculateAge(User user) {
+        /* custom code */
+    }
+}
+
+
+
+// Regular method of the repository interface
+User user = userRepository.findOne(id);
+// Custom method available via the interface, too
+userRepository.calculateAge(user);
+
+```
+
+
+## 📘 REST integration
+
+This example shows how to use `spring-data-dynamodb` with `spring-data-rest` to automatically expose CRUD operations on DynamoDB entities via REST endpoints.
+
+Further explanation can be found 
+* in the [rest/README.md](rest/README.md)
+* as also the [code](rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest)
+
+### 📜 Code sample
+An additional DynamoDB bean must be registered and injected - everything else happens via auto-configuration:
+
+```java
+@EnableDynamoDBRepositories(
+		mappingContextRef = "dynamoDBMappingContext",
+		basePackageClasses = UserRepository.class)
+
+
+@Bean
+public DynamoDBMappingContext dynamoDBMappingContext() {
+    return new DynamoDBMappingContext();
+}
+
+```
+
diff --git a/spring-data-dynamodb-examples/custom/README.md b/spring-data-dynamodb-examples/custom/README.md
new file mode 100644
index 00000000..bf4b2d87
--- /dev/null
+++ b/spring-data-dynamodb-examples/custom/README.md
@@ -0,0 +1,58 @@
+# 📚 Spring Data DynamoDB Examples - 📕 Custom repository methods
+
+This example shows how to use custom methods as part of *Spring Data* repository interfaces to implement custom logic.
+
+Further explanation can be found 
+* as also the [code](src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom)
+
+### 📜 Code sample
+The repository interface is extend by an additional interface. It's implementation is found by the `Impl` suffix in the same package.
+*Spring Data* itself takes care of weaving in the implementation at runtime:
+
+```java
+public interface UserRepository extends CrudRepository<User, Long>, CustomUserRepositoryMethods { }
+
+
+public interface CustomUserRepositoryMethods {
+    User calculateAge(User user);
+}
+
+
+public class CustomUserRepositoryMethodsImpl implements CustomUserRepositoryMethods {
+
+    @Override
+    public User calculateAge(User user) {
+        /* custom code */
+    }
+}
+
+
+
+// Regular method of the repository interface
+User user = userRepository.findOne(id);
+// Custom method available via the interface, too
+userRepository.calculateAge(user);
+
+```
+
+### 📝 How to prepare:
+* Update `src/main/resources/application.properties`
+
+| Key                          | Sample value                           | Description                                       |
+|------------------------------|----------------------------------------|---------------------------------------------------|
+| `amazon.aws.accesskey`       | N/A                                    | AWS accesskey for DynamoDB                        |
+| `amazon.aws.secretkey`       | N/A                                    | AWS secretkey for DynamoDB                        |
+
+### ▶️ How to run: 
+```
+ mvn -pl spring-data-dynamodb-examples/custom --also-make verify
+```
+
+### 📃 Output should look like:
+```
+2018-07-02 00:29:46.360  INFO 13591 --- [lication.main()] c.g.d.s.custom.Application               : Table USER found
+2018-07-02 00:29:46.438  INFO 13591 --- [lication.main()] c.g.d.s.custom.Application               : Created user: User{id=084941a8-6d1a-41d6-94ee-4412b8ca6d72, firstname='Sebastian', lastname='Mueller', birthday=1970-01-17T22:29:31.154Z, age=0}
+2018-07-02 00:29:46.479  INFO 13591 --- [lication.main()] c.g.d.s.custom.Application               : Called custom method: User{id=084941a8-6d1a-41d6-94ee-4412b8ca6d72, firstname='Sebastian', lastname='Mueller', birthday=1970-01-17T22:29:31.154Z, age=48}
+2018-07-02 00:29:46.506  INFO 13591 --- [lication.main()] c.g.d.s.custom.Application               : Comparison - Old entity: User{id=084941a8-6d1a-41d6-94ee-4412b8ca6d72, firstname='Sebastian', lastname='Mueller', birthday=1970-01-17T22:29:31.154Z, age=48}
+2018-07-02 00:29:46.506  INFO 13591 --- [lication.main()] c.g.d.s.custom.Application               : Comparison - New entity: User{id=084941a8-6d1a-41d6-94ee-4412b8ca6d72, firstname='Sebastian', lastname='Mueller', birthday=1970-01-17T22:29:31.154Z, age=48}
+```
diff --git a/spring-data-dynamodb-examples/custom/pom.xml b/spring-data-dynamodb-examples/custom/pom.xml
new file mode 100644
index 00000000..5140d5e0
--- /dev/null
+++ b/spring-data-dynamodb-examples/custom/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.github.derjust</groupId>
+        <artifactId>spring-data-dynamodb-examples</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+    <artifactId>spring-data-dynamodb-examples-custom</artifactId>
+    <name>Spring Data DynamoDB Custom Example</name>
+
+	<properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+	</properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.derjust</groupId>
+            <artifactId>spring-data-dynamodb</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.github.derjust.spring_data_dynamodb_examples.custom.Application</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/Application.java b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/Application.java
new file mode 100644
index 00000000..f37fd3a7
--- /dev/null
+++ b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/Application.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.custom;
+
+import java.time.Instant;
+import java.util.Optional;
+import java.util.Random;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@SpringBootApplication
+@Configuration
+@Import(DynamoDBConfig.class)
+public class Application {
+
+	private static final Logger log = LoggerFactory.getLogger(Application.class);
+
+	public static void main(String[] args) {
+		new SpringApplicationBuilder(Application.class).run(args);
+	}
+
+	@Bean
+	public CommandLineRunner custom(ConfigurableApplicationContext ctx, UserRepository userRepository) {
+		return (args) -> {
+
+			demoCustomInterface(userRepository);
+
+			ctx.close();
+		};
+	}
+
+	private void demoCustomInterface(UserRepository userRepository) {
+
+		// Create user & save it (creates Id)
+		User user = createUser();
+		userRepository.save(user);
+
+		log.info("Created user: {}", user);
+
+		// Call custom method on interface
+		userRepository.calculateAge(user);
+		log.info("Called custom method: {}", user);
+
+		// Reload instance to ensure custom method worked
+		Optional<User> reloadedUser = userRepository.findById(user.getId());
+
+		assert reloadedUser.isPresent();
+
+		log.info("Comparison - Old entity: {}", user);
+		log.info("Comparison - New entity: {}", reloadedUser.get());
+	}
+
+	private User createUser() {
+		User user = new User();
+
+		user.setFirstname("Sebastian");
+		user.setLastname("Mueller");
+
+		Random r = new Random();
+		user.setBirthday(Instant.ofEpochMilli(r.nextInt()));
+
+		return user;
+	}
+
+}
diff --git a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethods.java b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethods.java
new file mode 100644
index 00000000..02ded1fc
--- /dev/null
+++ b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethods.java
@@ -0,0 +1,20 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.custom;
+
+public interface CustomUserRepositoryMethods {
+	User calculateAge(User user);
+}
diff --git a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethodsImpl.java b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethodsImpl.java
new file mode 100644
index 00000000..af45b865
--- /dev/null
+++ b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethodsImpl.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.custom;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.ZoneId;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
+
+@SuppressWarnings("unused") // This class is used as per
+							// https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#repositories.custom-implementations
+public class CustomUserRepositoryMethodsImpl implements CustomUserRepositoryMethods {
+
+	private final DynamoDBMapper mapper;
+
+	@Autowired
+	public CustomUserRepositoryMethodsImpl(DynamoDBMapper mapper) {
+		this.mapper = mapper;
+	}
+
+	@Override
+	public User calculateAge(User user) {
+		// Just some javax.time mumbo-jumbo
+		Instant birthday = user.getBirthday();
+		LocalDate now = LocalDate.now();
+		Period age = Period.between(LocalDate.ofInstant(birthday, ZoneId.systemDefault()), now);
+
+		user.setAge(age.getYears());
+		mapper.save(user);
+
+		return user;
+	}
+
+}
diff --git a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/DynamoDBConfig.java b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/DynamoDBConfig.java
new file mode 100644
index 00000000..585f3353
--- /dev/null
+++ b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/DynamoDBConfig.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.custom;
+
+import org.socialsignin.spring.data.dynamodb.repository.config.EnableDynamoDBRepositories;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
+import com.amazonaws.regions.Regions;
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig;
+
+@Configuration
+@EnableDynamoDBRepositories(basePackageClasses = UserRepository.class)
+public class DynamoDBConfig {
+
+	@Bean
+	public AWSCredentialsProvider amazonAWSCredentialsProvider() {
+		// Use any AWSCredentialsProvider you like - or inject
+		// access/secret key via Spring's property mechanism
+		return new DefaultAWSCredentialsProviderChain();
+	}
+
+	@Bean
+	public DynamoDBMapperConfig dynamoDBMapperConfig() {
+		return DynamoDBMapperConfig.DEFAULT;
+	}
+
+	@Bean
+	public DynamoDBMapper dynamoDBMapper(AmazonDynamoDB amazonDynamoDB, DynamoDBMapperConfig config) {
+		return new DynamoDBMapper(amazonDynamoDB, config);
+	}
+
+	@Bean
+	public AmazonDynamoDB amazonDynamoDB(AWSCredentialsProvider amazonAWSCredentialsProvider) {
+		return AmazonDynamoDBClientBuilder.standard().withCredentials(amazonAWSCredentialsProvider)
+				.withRegion(Regions.US_EAST_1).build();
+	}
+}
diff --git a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/User.java b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/User.java
new file mode 100644
index 00000000..282a78d5
--- /dev/null
+++ b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/User.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.custom;
+
+import java.time.Instant;
+import java.util.UUID;
+
+import org.socialsignin.spring.data.dynamodb.marshaller.Instant2EpocheDynamoDBMarshaller;
+
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMarshalling;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable;
+
+@DynamoDBTable(tableName = "USER")
+public class User {
+
+	@DynamoDBHashKey
+	@DynamoDBAutoGeneratedKey()
+	private UUID id;
+	private String firstname;
+	private String lastname;
+	@DynamoDBMarshalling(marshallerClass = Instant2EpocheDynamoDBMarshaller.class)
+	private Instant birthday;
+	private long age;
+
+	public UUID getId() {
+		return id;
+	}
+
+	public void setId(UUID id) {
+		this.id = id;
+	}
+
+	public String getFirstname() {
+		return firstname;
+	}
+
+	public void setFirstname(String firstname) {
+		this.firstname = firstname;
+	}
+
+	public String getLastname() {
+		return lastname;
+	}
+
+	public void setLastname(String lastname) {
+		this.lastname = lastname;
+	}
+
+	public Instant getBirthday() {
+		return birthday;
+	}
+
+	public void setBirthday(Instant birthday) {
+		this.birthday = birthday;
+	}
+
+	public long getAge() {
+		return age;
+	}
+
+	public void setAge(long age) {
+		this.age = age;
+	}
+
+	@Override
+	public String toString() {
+		return "User{" + "id=" + id + ", firstname='" + firstname + '\'' + ", lastname='" + lastname + '\''
+				+ ", birthday=" + birthday + ", age=" + age + '}';
+	}
+}
diff --git a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/UserRepository.java b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/UserRepository.java
new file mode 100644
index 00000000..ffbd8423
--- /dev/null
+++ b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/UserRepository.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.custom;
+
+import java.util.UUID;
+
+import org.socialsignin.spring.data.dynamodb.repository.EnableScan;
+import org.springframework.data.repository.CrudRepository;
+
+@EnableScan
+public interface UserRepository extends CrudRepository<User, UUID>, CustomUserRepositoryMethods {
+
+}
diff --git a/spring-data-dynamodb-examples/custom/src/main/resources/application.properties b/spring-data-dynamodb-examples/custom/src/main/resources/application.properties
new file mode 100644
index 00000000..5bd3ad98
--- /dev/null
+++ b/spring-data-dynamodb-examples/custom/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.data.dynamodb.entity2ddl.auto=create-only
diff --git a/spring-data-dynamodb-examples/multirepo/README.md b/spring-data-dynamodb-examples/multirepo/README.md
new file mode 100644
index 00000000..14b9f056
--- /dev/null
+++ b/spring-data-dynamodb-examples/multirepo/README.md
@@ -0,0 +1,74 @@
+# 📚 Spring Data DynamoDB Examples - 📗 Multi Repository
+
+This example shows how to use multiple *Spring Data* repository types to access different storage backend. 
+
+In this example `DynamoDB` and `MySQL` is used.
+
+Further explanation can be found 
+* as also the [code](src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo)
+
+
+### 📜 Explanation
+The respective repository providers must be informed which interface to take care of.
+In a `@Configurable` bean the interfaces have to be assigned via `include`/`exclude` filters:
+
+```java
+@SpringBootApplication
+@EnableJpaRepositories(
+  includeFilters = {
+    @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {
+      CustomerRepository.class}
+  )}
+)
+@EnableDynamoDBRepositories(
+  includeFilters = {
+    @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {
+      DeviceRepository.class}
+  )}
+)
+@Configuration
+public class Application {
+```
+
+### 📝 How to prepare:
+* Update `src/main/resources/application.properties`
+
+| Key                          | Sample value                           | Description                                       |
+|------------------------------|----------------------------------------|---------------------------------------------------|
+| `spring.datasource.url`      | `jdbc:mysql://localhost:3306/customer` | MySQL connection url including the database name  |
+| `spring.datasource.username` | `root`                                 | MySQL user with `CREATE`/`INSERT`/`SELECT` grants |
+| `spring.datasource.password` | `root`                                 | MySQL user's password                             |
+| `amazon.aws.accesskey`       | N/A                                    | AWS accesskey for DynamoDB                        |
+| `amazon.aws.secretkey`       | N/A                                    | AWS secretkey for DynamoDB                        |
+
+### ▶️ How to run: 
+```
+ mvn -pl spring-data-dynamodb-examples/multirepo --also-make verify
+```
+
+### 📃 Output should look like:
+```
+2018-02-06 23:58:18.738  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : Customers found with findAll():
+2018-02-06 23:58:18.738  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : -------------------------------
+2018-02-06 23:58:18.910  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : Customer[id=1, firstName='Jack', lastName='Bauer']
+2018-02-06 23:58:18.910  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : Customer[id=2, firstName='Chloe', lastName='O'Brian']
+2018-02-06 23:58:18.910  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : Customer[id=3, firstName='Kim', lastName='Bauer']
+2018-02-06 23:58:18.911  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : Customer[id=4, firstName='David', lastName='Palmer']
+2018-02-06 23:58:18.911  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : Customer[id=5, firstName='Michelle', lastName='Dessler']
+2018-02-06 23:58:18.911  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : 
+2018-02-06 23:58:18.925  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : Customer found with findOne(1L):
+2018-02-06 23:58:18.925  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : --------------------------------
+2018-02-06 23:58:18.925  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : Customer[id=1, firstName='Jack', lastName='Bauer']
+2018-02-06 23:58:18.925  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : 
+2018-02-06 23:58:18.925  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : Customer found with findByLastName('Bauer'):
+2018-02-06 23:58:18.925  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : --------------------------------------------
+2018-02-06 23:58:18.954  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : Customer[id=1, firstName='Jack', lastName='Bauer']
+2018-02-06 23:58:18.954  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : Customer[id=3, firstName='Kim', lastName='Bauer']
+2018-02-06 23:58:18.954  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : 
+2018-02-06 23:58:19.389  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : Table Device found
+2018-02-06 23:58:19.537  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : Devices found with findAll():
+2018-02-06 23:58:19.538  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : -------------------------------
+2018-02-06 23:58:19.573  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : Device[id=DeviceKey[vendorId=2, product='Product CB'], name='C', lastChange='Tue Feb 06 23:58:19 EST 2018']
+2018-02-06 23:58:19.573  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : Device[id=DeviceKey[vendorId=1, product='Product A'], name='A', lastChange='Tue Feb 06 23:58:19 EST 2018']
+2018-02-06 23:58:19.574  INFO 14962 --- [lication.main()] c.g.s.examples.multirepo.Application     : Device[id=DeviceKey[vendorId=1, product='Product B'], name='B', lastChange='Tue Feb 06 23:58:19 EST 2018']
+```
diff --git a/spring-data-dynamodb-examples/multirepo/pom.xml b/spring-data-dynamodb-examples/multirepo/pom.xml
new file mode 100644
index 00000000..e4e3abd3
--- /dev/null
+++ b/spring-data-dynamodb-examples/multirepo/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright © 2018 spring-data-dynamodb-examples-multirepo (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.github.derjust</groupId>
+        <artifactId>spring-data-dynamodb-examples</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+    <artifactId>spring-data-dynamodb-examples-multirepo</artifactId>
+    <name>Spring Data DynamoDB Multirepo Example</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.derjust</groupId>
+            <artifactId>spring-data-dynamodb</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.github.derjust.spring_data_dynamodb_examples.multirepo.Application</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Application.java b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Application.java
new file mode 100644
index 00000000..2dc041d1
--- /dev/null
+++ b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Application.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-multirepo (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.multirepo;
+
+import java.util.Date;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@SpringBootApplication
+@Configuration
+@Import(DynamoDBConfig.class)
+public class Application {
+
+	private static final Logger log = LoggerFactory.getLogger(Application.class);
+
+	public static void main(String[] args) {
+		new SpringApplicationBuilder(Application.class).run(args);
+	}
+
+	@Bean
+	public CommandLineRunner multirepo(ConfigurableApplicationContext ctx, CustomerRepository jpaRepository,
+			DeviceRepository dynamoDBRepository) {
+		return (args) -> {
+			demoJPA(jpaRepository);
+
+			// Tables are autocreated
+			demoDynamoDB(dynamoDBRepository);
+
+			ctx.close();
+		};
+	}
+
+	private void demoDynamoDB(DeviceRepository dynamoDBRepository) {
+		// save a couple of devices
+		dynamoDBRepository.save(new Device(1L, "Product A", "A", new Date()));
+		dynamoDBRepository.save(new Device(1L, "Product B", "B", new Date()));
+		dynamoDBRepository.save(new Device(2L, "Product C", "C", new Date()));
+
+		// fetch all devices
+		log.info("Devices found with findAll():");
+		log.info("-------------------------------");
+		for (Device device : dynamoDBRepository.findAll()) {
+			log.info(device.toString());
+		}
+		log.info("");
+
+	}
+
+	private void demoJPA(CustomerRepository jpaRepository) {
+		// save a couple of customers
+		jpaRepository.save(new Customer("Jack", "Bauer"));
+		jpaRepository.save(new Customer("Chloe", "O'Brian"));
+		jpaRepository.save(new Customer("Kim", "Bauer"));
+		jpaRepository.save(new Customer("David", "Palmer"));
+		jpaRepository.save(new Customer("Michelle", "Dessler"));
+
+		// fetch all customers
+		log.info("Customers found with findAll():");
+		log.info("-------------------------------");
+		for (Customer customer : jpaRepository.findAll()) {
+			log.info(customer.toString());
+		}
+		log.info("");
+
+		// fetch an individual customer by ID
+		Optional<Customer> customer = jpaRepository.findById(1L);
+		log.info("Customer found with findOne(1L):");
+		log.info("--------------------------------");
+		log.info(customer.get().toString());
+		log.info("");
+
+		// fetch customers by last name
+		log.info("Customer found with findByLastName('Bauer'):");
+		log.info("--------------------------------------------");
+		//TODO
+		/*for (Customer bauer : jpaRepository.findByLastName("Bauer")) {
+			log.info(bauer.toString());
+		}*/
+		log.info("");
+	}
+
+}
diff --git a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Customer.java b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Customer.java
new file mode 100644
index 00000000..b6c115d5
--- /dev/null
+++ b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Customer.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-multirepo (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.multirepo;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Customer {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private Long id;
+	private String firstName;
+	private String lastName;
+
+	protected Customer() {
+	}
+
+	public Customer(String firstName, String lastName) {
+		this.firstName = firstName;
+		this.lastName = lastName;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	@Override
+	public String toString() {
+		return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
+	}
+
+}
diff --git a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/CustomerRepository.java b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/CustomerRepository.java
new file mode 100644
index 00000000..009783b0
--- /dev/null
+++ b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/CustomerRepository.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-multirepo (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.multirepo;
+
+import java.util.List;
+
+import org.springframework.data.repository.CrudRepository;
+
+/** The JPA repository */
+public interface CustomerRepository extends CrudRepository<Customer, Long> {
+
+	//List<Customer> findByLastName(String lastName);
+}
diff --git a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Device.java b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Device.java
new file mode 100644
index 00000000..8191ae3c
--- /dev/null
+++ b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Device.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-multirepo (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.multirepo;
+
+import java.util.Date;
+
+import org.springframework.data.annotation.Id;
+
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable;
+
+@DynamoDBTable(tableName = "Device")
+public class Device {
+	@Id
+	private DeviceKey key;
+
+	@DynamoDBAttribute(attributeName = "Name")
+	private String name;
+
+	@DynamoDBAttribute(attributeName = "LastChange")
+	private Date lastChange;
+
+	private Device(DeviceKey key, String name, Date lastChange) {
+		this.key = key;
+		this.name = name;
+		this.lastChange = lastChange;
+	}
+
+	public Device(Long vendorId, String productId, String name, Date lastChange) {
+		this(new DeviceKey(vendorId, productId), name, lastChange);
+	}
+
+	public Device() {
+	}
+
+	@DynamoDBHashKey(attributeName = "VendorId")
+	public Long getVendorId() {
+		return (key != null) ? key.getVendorId() : null;
+	}
+
+	public void setVendorId(Long vendorId) {
+		if (key == null) {
+			key = new DeviceKey();
+		}
+		key.setVendorId(vendorId);
+	}
+
+	@DynamoDBRangeKey(attributeName = "ProductId")
+	public String getProductId() {
+		return (key != null) ? key.getProduct() : null;
+	}
+
+	public void setProductId(String product) {
+		if (key == null) {
+			key = new DeviceKey();
+		}
+		key.setProduct(product);
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Date getLastChange() {
+		return lastChange;
+	}
+
+	public void setLastChange(Date lastChange) {
+		this.lastChange = lastChange;
+	}
+
+	@Override
+	public String toString() {
+		return String.format("Device[id=%s, name='%s', lastChange='%s']", key, name, lastChange);
+	}
+}
diff --git a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DeviceKey.java b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DeviceKey.java
new file mode 100644
index 00000000..ba982a41
--- /dev/null
+++ b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DeviceKey.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-multirepo (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.multirepo;
+
+import java.io.Serializable;
+
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey;
+
+public class DeviceKey implements Serializable {
+
+	private Long vendorId;
+
+	private String product;
+
+	public DeviceKey() {
+	}
+
+	public DeviceKey(Long vendorIr, String product) {
+		this.vendorId = vendorIr;
+		this.product = product;
+	}
+
+	@DynamoDBHashKey
+	public Long getVendorId() {
+		return vendorId;
+	}
+
+	public void setVendorId(Long vendorId) {
+		this.vendorId = vendorId;
+	}
+
+	@DynamoDBRangeKey
+	public String getProduct() {
+		return product;
+	}
+
+	public void setProduct(String product) {
+		this.product = product;
+	}
+
+	@Override
+	public String toString() {
+		return String.format("DeviceKey[vendorId=%d, product='%s']", vendorId, product);
+	}
+
+}
diff --git a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DeviceRepository.java b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DeviceRepository.java
new file mode 100644
index 00000000..f2fe45f8
--- /dev/null
+++ b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DeviceRepository.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-multirepo (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.multirepo;
+
+import java.util.List;
+
+import org.socialsignin.spring.data.dynamodb.repository.EnableScan;
+import org.springframework.data.repository.CrudRepository;
+
+/** The DynamoDB repository */
+@EnableScan
+public interface DeviceRepository extends CrudRepository<Device, DeviceKey> {
+
+	List<Device> findAll();
+
+}
\ No newline at end of file
diff --git a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DynamoDBConfig.java b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DynamoDBConfig.java
new file mode 100644
index 00000000..ff25bd25
--- /dev/null
+++ b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DynamoDBConfig.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-multirepo (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.multirepo;
+
+import org.socialsignin.spring.data.dynamodb.repository.config.EnableDynamoDBRepositories;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+
+import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
+import com.amazonaws.regions.Regions;
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig;
+
+@Configuration
+@EnableJpaRepositories(includeFilters = {
+		@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {CustomerRepository.class})})
+@EnableDynamoDBRepositories(includeFilters = {
+		@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {DeviceRepository.class})})
+public class DynamoDBConfig {
+
+	public AWSCredentialsProvider amazonAWSCredentialsProvider() {
+		// Use any AWSCredentialsProvider you like - or inject
+		// access/secret key via Spring's property mechanism
+		return new DefaultAWSCredentialsProviderChain();
+	}
+
+	@Primary
+	@Bean
+	public DynamoDBMapperConfig dynamoDBMapperConfig() {
+		return DynamoDBMapperConfig.DEFAULT;
+	}
+
+	@Primary
+	@Bean
+	public DynamoDBMapper dynamoDBMapper32(AmazonDynamoDB amazonDynamoDB, DynamoDBMapperConfig config) {
+		return new DynamoDBMapper(amazonDynamoDB, config);
+	}
+
+	@Bean
+	public AmazonDynamoDB amazonDynamoDB() {
+		return AmazonDynamoDBClientBuilder.standard().withCredentials(amazonAWSCredentialsProvider())
+				.withRegion(Regions.US_EAST_1).build();
+	}
+
+}
diff --git a/spring-data-dynamodb-examples/multirepo/src/main/resources/application.properties b/spring-data-dynamodb-examples/multirepo/src/main/resources/application.properties
new file mode 100644
index 00000000..2a91c25e
--- /dev/null
+++ b/spring-data-dynamodb-examples/multirepo/src/main/resources/application.properties
@@ -0,0 +1,6 @@
+spring.data.dynamodb.entity2ddl.auto=create-only
+
+spring.datasource.url=jdbc:h2:mem:customerdb
+
+# Enabling H2 Console
+spring.h2.console.enabled=true
diff --git a/spring-data-dynamodb-examples/pom.xml b/spring-data-dynamodb-examples/pom.xml
new file mode 100644
index 00000000..3428da28
--- /dev/null
+++ b/spring-data-dynamodb-examples/pom.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright © 2018 spring-data-dynamodb-examples (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples)
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.github.derjust</groupId>
+        <artifactId>spring-data-dynamodb-parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>spring-data-dynamodb-examples</artifactId>
+    <packaging>pom</packaging>
+    <name>Spring Data DynamoDB Examples</name>
+
+    <description>Examples for Spring-Data-DynamoDB available at https://github.com/derjust/spring-data-dynamodb/</description>
+
+    <properties>
+        <maven.compiler.source>1.9</maven.compiler.source>
+        <maven.compiler.target>1.9</maven.compiler.target>
+        <exec-phase>verify</exec-phase>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>2.0.3.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <!-- Fix for JDK9 -->
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.3.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.github.derjust</groupId>
+                <artifactId>spring-data-dynamodb</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>1.6.0</version>
+                    <executions>
+                        <execution>
+                            <id>exec</id>
+                            <phase>${exec-phase}</phase>
+                            <goals>
+                                <goal>java</goal>
+                            </goals>
+                      </execution>
+                    </executions>
+                </plugin>
+              </plugins>
+            </pluginManagement>
+            <plugins>
+              <plugin>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                      <skipTests>true</skipTests>
+                  </configuration>
+              </plugin>
+              <plugin>
+                  <groupId>org.jacoco</groupId>
+                  <artifactId>jacoco-maven-plugin</artifactId>
+                  <executions>
+                      <execution>
+                          <id>check</id>
+                          <phase>none</phase>
+                      </execution>
+                      <execution>
+                          <id>report</id>
+                          <phase>none</phase>
+                      </execution>
+                  </executions>
+              </plugin>
+            </plugins>
+          </build>
+
+    <modules>
+        <module>simple</module>
+        <module>custom</module>
+        <module>multirepo</module>
+        <module>rest</module>
+    </modules>
+
+</project>
diff --git a/spring-data-dynamodb-examples/rest/README.md b/spring-data-dynamodb-examples/rest/README.md
new file mode 100644
index 00000000..86ff9ac2
--- /dev/null
+++ b/spring-data-dynamodb-examples/rest/README.md
@@ -0,0 +1,56 @@
+# 📚 Spring Data DynamoDB Examples - 📘 REST integration
+
+This example shows how to use `spring-data-dynamodb` with `spring-data-rest` to automatically expose CRUD operations on DynamoDB entities via REST endpoints.
+
+Further explanation can be found 
+* as also the [code](src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest)
+
+### 📜 Code sample
+
+
+```java
+
+@EnableDynamoDBRepositories(
+		mappingContextRef = "dynamoDBMappingContext",
+		includeFilters = {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {
+				UserRepository.class}
+		)}
+)
+
+
+@Bean
+public DynamoDBMappingContext dynamoDBMappingContext() {
+    return new DynamoDBMappingContext();
+}
+
+```
+
+
+### 📝 How to prepare:
+* Update `src/main/resources/application.properties`
+
+| Key                          | Sample value                           | Description                                       |
+|------------------------------|----------------------------------------|---------------------------------------------------|
+| `amazon.aws.accesskey`       | N/A                                    | AWS accesskey for DynamoDB                        |
+| `amazon.aws.secretkey`       | N/A                                    | AWS secretkey for DynamoDB                        |
+
+### ▶️ How to run: 
+```
+ mvn -pl spring-data-dynamodb-examples/rest --also-make verify
+```
+
+### 📃 Output should look like:
+```
+2018-07-02 19:20:42.300  INFO 22828 --- [lication.main()] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 8080 (http) with context path ''
+2018-07-02 19:20:42.304  INFO 22828 --- [lication.main()] c.g.d.s.rest.Application                 : Started Application in 4.645 seconds (JVM running for 8.315)
+2018-07-02 19:20:42.789  INFO 22828 --- [lication.main()] c.g.d.s.common.DynamoDBConfig            : Table Device found
+2018-07-02 19:20:42.900  INFO 22828 --- [lication.main()] c.g.d.s.rest.Application                 : Users found with findAll():
+2018-07-02 19:20:42.900  INFO 22828 --- [lication.main()] c.g.d.s.rest.Application                 : -------------------------------
+2018-07-02 19:20:42.941  INFO 22828 --- [lication.main()] c.g.d.s.rest.Application                 : User{id=034446ed-e6f1-45bd-9de2-a4d7867e01c9, firstname='you', lastname='you'}
+2018-07-02 19:20:42.941  INFO 22828 --- [lication.main()] c.g.d.s.rest.Application                 : User{id=da5966e8-ded5-425d-8ddf-df8ac49093e1, firstname='me', lastname='me'}
+2018-07-02 19:20:42.944  INFO 22828 --- [lication.main()] c.g.d.s.rest.Application                 : 
+2018-07-02 19:20:42.944  INFO 22828 --- [lication.main()] c.g.d.s.rest.Application                 : 
+2018-07-02 19:20:42.944  INFO 22828 --- [lication.main()] c.g.d.s.rest.Application                 : Run curl -v http://localhost:8080/users and follow the HATEOS links
+2018-07-02 19:20:42.944  INFO 22828 --- [lication.main()] c.g.d.s.rest.Application                 : 
+2018-07-02 19:20:42.944  INFO 22828 --- [lication.main()] c.g.d.s.rest.Application                 : Press <enter> to shutdown
+```
diff --git a/spring-data-dynamodb-examples/rest/pom.xml b/spring-data-dynamodb-examples/rest/pom.xml
new file mode 100644
index 00000000..ffe89456
--- /dev/null
+++ b/spring-data-dynamodb-examples/rest/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright © 2018 spring-data-dynamodb-examples-rest (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.github.derjust</groupId>
+        <artifactId>spring-data-dynamodb-examples</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+    <artifactId>spring-data-dynamodb-examples-rest</artifactId>
+    <name>Spring Data DynamoDB REST Example</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-rest-webmvc</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.derjust</groupId>
+            <artifactId>spring-data-dynamodb</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.github.derjust.spring_data_dynamodb_examples.rest.Application</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+      <profile>
+          <id>ci</id>
+          <properties>
+              <exec-phase>none</exec-phase>
+          </properties>
+      </profile>
+    </profiles>
+
+</project>
diff --git a/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/Application.java b/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/Application.java
new file mode 100644
index 00000000..e77afc52
--- /dev/null
+++ b/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/Application.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-rest (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.rest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig;
+
+@SpringBootApplication
+@Configuration
+@Import({DynamoDBConfig.class})
+public class Application {
+
+	private static final Logger log = LoggerFactory.getLogger(Application.class);
+
+	public static void main(String[] args) {
+		new SpringApplicationBuilder(Application.class).web(WebApplicationType.SERVLET).run(args);
+	}
+
+	@Bean
+	public CommandLineRunner rest(ConfigurableApplicationContext ctx, UserRepository dynamoDBRepository,
+			AmazonDynamoDB amazonDynamoDB, DynamoDBMapper dynamoDBMapper, DynamoDBMapperConfig config) {
+		return (args) -> {
+
+			createEntities(dynamoDBRepository);
+
+			log.info("");
+			log.info("Run curl -v http://localhost:8080/users and follow the HATEOS links");
+			log.info("");
+			log.info("Press <enter> to shutdown");
+			System.in.read();
+			ctx.close();
+		};
+	}
+
+	private void createEntities(UserRepository dynamoDBRepository) {
+		// save a couple of devices
+		dynamoDBRepository.save(new User("me", "me"));
+		dynamoDBRepository.save(new User("you", "you"));
+
+		// fetch all devices
+		log.info("Users found with findAll():");
+		log.info("-------------------------------");
+		for (User user : dynamoDBRepository.findAll()) {
+			log.info(user.toString());
+		}
+		log.info("");
+
+	}
+
+}
diff --git a/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/DynamoDBConfig.java b/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/DynamoDBConfig.java
new file mode 100644
index 00000000..914bbdff
--- /dev/null
+++ b/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/DynamoDBConfig.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-rest (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.rest;
+
+import org.socialsignin.spring.data.dynamodb.mapping.DynamoDBMappingContext;
+import org.socialsignin.spring.data.dynamodb.repository.config.EnableDynamoDBRepositories;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
+import com.amazonaws.regions.Regions;
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig;
+
+@Configuration
+@EnableDynamoDBRepositories(mappingContextRef = "dynamoDBMappingContext", basePackageClasses = UserRepository.class)
+public class DynamoDBConfig {
+
+	public AWSCredentialsProvider amazonAWSCredentialsProvider() {
+		// Use any AWSCredentialsProvider you like - or inject
+		// access/secret key via Spring's property mechanism
+		return new DefaultAWSCredentialsProviderChain();
+	}
+
+	@Bean
+	public DynamoDBMapperConfig dynamoDBMapperConfig() {
+		return DynamoDBMapperConfig.DEFAULT;
+	}
+
+	@Bean
+	public DynamoDBMapper dynamoDBMapper(AmazonDynamoDB amazonDynamoDB, DynamoDBMapperConfig config) {
+		return new DynamoDBMapper(amazonDynamoDB, config);
+	}
+
+	@Bean
+	public AmazonDynamoDB amazonDynamoDB() {
+		return AmazonDynamoDBClientBuilder.standard()
+				.withCredentials(amazonAWSCredentialsProvider())
+				.withRegion(Regions.US_EAST_1).build();
+	}
+
+	@Bean
+	public DynamoDBMappingContext dynamoDBMappingContext() {
+		return new DynamoDBMappingContext();
+	}
+
+}
diff --git a/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/User.java b/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/User.java
new file mode 100644
index 00000000..0271c510
--- /dev/null
+++ b/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/User.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-rest (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.rest;
+
+import java.util.UUID;
+
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable;
+
+@DynamoDBTable(tableName = "USER")
+public class User {
+
+	@DynamoDBHashKey
+	@DynamoDBAutoGeneratedKey()
+	private UUID id;
+	private String firstname;
+	private String lastname;
+
+	public User(String firstname, String lastname) {
+		this.firstname = firstname;
+		this.lastname = lastname;
+	}
+
+	public User() {
+
+	}
+
+	public UUID getId() {
+		return id;
+	}
+
+	public void setId(UUID id) {
+		this.id = id;
+	}
+
+	public String getFirstname() {
+		return firstname;
+	}
+
+	public void setFirstname(String firstname) {
+		this.firstname = firstname;
+	}
+
+	public String getLastname() {
+		return lastname;
+	}
+
+	public void setLastname(String lastname) {
+		this.lastname = lastname;
+	}
+
+	@Override
+	public String toString() {
+		return "User{" + "id=" + id + ", firstname='" + firstname + '\'' + ", lastname='" + lastname + '\'' + '}';
+	}
+}
diff --git a/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/UserRepository.java b/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/UserRepository.java
new file mode 100644
index 00000000..890a2d81
--- /dev/null
+++ b/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/UserRepository.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-rest (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.rest;
+
+import java.util.UUID;
+
+import org.socialsignin.spring.data.dynamodb.repository.EnableScan;
+import org.springframework.data.repository.CrudRepository;
+
+@EnableScan()
+public interface UserRepository extends CrudRepository<User, UUID> {
+
+}
diff --git a/spring-data-dynamodb-examples/rest/src/main/resources/application.properties b/spring-data-dynamodb-examples/rest/src/main/resources/application.properties
new file mode 100644
index 00000000..5bd3ad98
--- /dev/null
+++ b/spring-data-dynamodb-examples/rest/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.data.dynamodb.entity2ddl.auto=create-only
diff --git a/spring-data-dynamodb-examples/simple/README.md b/spring-data-dynamodb-examples/simple/README.md
new file mode 100644
index 00000000..661b1d0d
--- /dev/null
+++ b/spring-data-dynamodb-examples/simple/README.md
@@ -0,0 +1,104 @@
+# 📚 Spring Data DynamoDB Examples - 🚀 Simple Repository
+
+This example shows how to use custom methods as part of *Spring Data* repository interfaces to implement custom logic.
+
+Further explanation can be found 
+* as also the [code](src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple)
+
+### 📜 Code sample
+The repository interface defines the query method
+
+```java
+@EnableScan
+public interface UserRepository extends CrudRepository<User, String> {
+	List<User> findByLastName(String lastName);
+}
+```
+
+for a respective entity class
+
+```java
+@DynamoDBTable(tableName = "User")
+public class User {
+
+	private String id;
+	private String firstName;
+	private String lastName;
+
+	public User() {
+		// Default constructor is required by AWS DynamoDB SDK
+	}
+
+	public User(String firstName, String lastName) {
+		this.firstName = firstName;
+		this.lastName = lastName;
+	}
+
+	@DynamoDBHashKey
+	@DynamoDBAutoGeneratedKey
+	public String getId() {
+		return id;
+	}
+
+	@DynamoDBAttribute
+	public String getFirstName() {
+		return firstName;
+	}
+
+	@DynamoDBAttribute
+	public String getLastName() {
+		return lastName;
+	}
+	
+	// setters skipped
+}
+```
+
+and used 
+
+```java
+	@Autowired
+	private UserRepository repository;
+
+	@Test
+	public void sampleTestCase() {
+		User gosling = new User("James", "Gosling");
+		repository.save(gosling);
+
+		User hoeller = new User("Juergen", "Hoeller");
+		repository.save(hoeller);
+
+		List<User> result = repository.findByLastName("Gosling");
+		Assert.assertThat(result.size(), is(1));
+		Assert.assertThat(result, hasItem(gosling));
+		log.info("Found in table: {}", result.get(0));
+	}
+```
+
+### 📝 How to prepare:
+* Update `src/main/resources/application.properties`
+
+| Key                          | Sample value                           | Description                                       |
+|------------------------------|----------------------------------------|---------------------------------------------------|
+| `amazon.aws.accesskey`       | N/A                                    | AWS accesskey for DynamoDB                        |
+| `amazon.aws.secretkey`       | N/A                                    | AWS secretkey for DynamoDB                        |
+
+### ▶️ How to run: 
+```
+ mvn -pl spring-data-dynamodb-examples/simple --also-make verify
+```
+
+### 📃 Output should look like:
+```
+2018-10-10 00:56:22.055  INFO 3174 --- [           main] f.a.AutowiredAnnotationBeanPostProcessor : JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
+2018-10-10 00:56:22.561  INFO 3174 --- [           main] o.s.s.d.d.r.s.DynamoDBRepositoryFactory  : Spring Data DynamoDB Version: 5.0.3-SNAPSHOT (2.0)
+2018-10-10 00:56:22.562  INFO 3174 --- [           main] o.s.s.d.d.r.s.DynamoDBRepositoryFactory  : Spring Data Version:          2.0.8.RELEASE
+2018-10-10 00:56:22.562  INFO 3174 --- [           main] o.s.s.d.d.r.s.DynamoDBRepositoryFactory  : AWS SDK Version:              1.11.301
+2018-10-10 00:56:22.562  INFO 3174 --- [           main] o.s.s.d.d.r.s.DynamoDBRepositoryFactory  : Java Version:                 9.0.1 - Java HotSpot(TM) 64-Bit Server VM 9.0.1+11
+2018-10-10 00:56:22.562  INFO 3174 --- [           main] o.s.s.d.d.r.s.DynamoDBRepositoryFactory  : Platform Details:             Mac OS X 10.14
+2018-10-10 00:56:22.696  INFO 3174 --- [           main] c.g.d.s.simple.UserRepositoryIT          : Started UserRepositoryIT in 1.236 seconds (JVM running for 1.997)
+2018-10-10 00:56:23.165  INFO 3174 --- [           main] c.g.d.s.simple.UserRepositoryIT          : Created table User
+2018-10-10 00:56:43.223  INFO 3174 --- [           main] c.g.d.s.simple.UserRepositoryIT          : Table User is active
+2018-10-10 00:56:43.346  INFO 3174 --- [           main] c.g.d.s.simple.UserRepositoryIT          : Found in table: User [id=7296cf2a-ac68-4a59-9bb4-b1cc3278715a, firstName=James, lastName=Gosling]
+2018-10-10 00:56:43.391  INFO 3174 --- [           main] c.g.d.s.simple.UserRepositoryIT          : Deleted table User
+```
diff --git a/spring-data-dynamodb-examples/simple/pom.xml b/spring-data-dynamodb-examples/simple/pom.xml
new file mode 100644
index 00000000..110de999
--- /dev/null
+++ b/spring-data-dynamodb-examples/simple/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright © 2018 spring-data-dynamodb-examples-simple (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.github.derjust</groupId>
+        <artifactId>spring-data-dynamodb-examples</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+    <artifactId>spring-data-dynamodb-examples-simple</artifactId>
+    <name>Spring Data DynamoDB Simple Example</name>
+
+	<properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+	</properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.derjust</groupId>
+            <artifactId>spring-data-dynamodb</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.github.derjust.spring_data_dynamodb_examples.simple.Application</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/Application.java b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/Application.java
new file mode 100644
index 00000000..d612ff72
--- /dev/null
+++ b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/Application.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-rest (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.simple;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@SpringBootApplication
+@Configuration
+@Import({DynamoDBConfig.class})
+public class Application {
+
+	private static final Logger log = LoggerFactory.getLogger(Application.class);
+
+	public static void main(String[] args) {
+		new SpringApplicationBuilder(Application.class).run(args);
+	}
+
+	@Bean
+	public CommandLineRunner simple(ConfigurableApplicationContext ctx, UserRepository dynamoDBRepository) {
+		return (args) -> {
+
+			// save a couple of devices
+			dynamoDBRepository.save(new User("me", "me"));
+			dynamoDBRepository.save(new User("you", "you"));
+
+			// fetch all devices
+			log.info("Users found with findAll():");
+			log.info("-------------------------------");
+			for (User user : dynamoDBRepository.findAll()) {
+				log.info(user.toString());
+			}
+			log.info("");
+			
+			ctx.close();
+		};
+	}
+
+}
diff --git a/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/DynamoDBConfig.java b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/DynamoDBConfig.java
new file mode 100644
index 00000000..ddc8b1a1
--- /dev/null
+++ b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/DynamoDBConfig.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-simple (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.simple;
+
+import org.socialsignin.spring.data.dynamodb.repository.config.EnableDynamoDBRepositories;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
+import com.amazonaws.regions.Regions;
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
+
+@Configuration
+@EnableDynamoDBRepositories(basePackageClasses = UserRepository.class)
+public class DynamoDBConfig {
+
+	@Bean
+	public AWSCredentialsProvider amazonAWSCredentialsProvider() {
+		// Use any AWSCredentialsProvider you like - or inject
+		// access/secret key via Spring's property mechanism
+		return new DefaultAWSCredentialsProviderChain();
+	}
+
+	@Bean
+	public AmazonDynamoDB amazonDynamoDB(AWSCredentialsProvider amazonAWSCredentialsProvider) {
+		return AmazonDynamoDBClientBuilder.standard()
+				.withCredentials(amazonAWSCredentialsProvider)
+				.withRegion(Regions.US_EAST_1).build();
+	}
+
+}
diff --git a/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/PagingUserRepository.java b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/PagingUserRepository.java
new file mode 100644
index 00000000..7bd325b6
--- /dev/null
+++ b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/PagingUserRepository.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-simple (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.simple;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.socialsignin.spring.data.dynamodb.repository.EnableScan;
+import org.socialsignin.spring.data.dynamodb.repository.EnableScanCount;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface PagingUserRepository extends PagingAndSortingRepository<User, String> {
+	Page<User> findByLastName(String lastName, Pageable pageable);
+
+	@EnableScan
+	@EnableScanCount
+	Page<User> findAll(Pageable pageable);
+	
+	@EnableScan
+	List<User> findByIdIn(Collection<String> id);
+
+
+}
\ No newline at end of file
diff --git a/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/User.java b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/User.java
new file mode 100644
index 00000000..813f2af6
--- /dev/null
+++ b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/User.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-simple (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.simple;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable;
+
+@DynamoDBTable(tableName = "User")
+public class User {
+
+	private String id;
+	private String firstName;
+	private String lastName;
+
+	public User() {
+		// Default constructor is required by AWS DynamoDB SDK
+	}
+
+	public User(String firstName, String lastName) {
+		this.firstName = firstName;
+		this.lastName = lastName;
+	}
+
+	@DynamoDBHashKey
+	@DynamoDBAutoGeneratedKey
+	public String getId() {
+		return id;
+	}
+
+	@DynamoDBAttribute
+	public String getFirstName() {
+		return firstName;
+	}
+
+	@DynamoDBAttribute
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	@Override
+	public String toString() {
+		return "User [id=" + id + ", firstName=" + firstName + ", lastName=" + lastName + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(firstName, id, lastName);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		User other = (User) obj;
+		return Arrays.deepEquals(new Object[]{firstName, id, lastName},
+				new Object[]{other.firstName, other.id, other.lastName});
+	}
+
+}
\ No newline at end of file
diff --git a/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepository.java b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepository.java
new file mode 100644
index 00000000..c7ea62d8
--- /dev/null
+++ b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepository.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-simple (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.simple;
+
+import java.util.List;
+
+import org.socialsignin.spring.data.dynamodb.repository.EnableScan;
+import org.springframework.data.repository.CrudRepository;
+
+@EnableScan
+public interface UserRepository extends CrudRepository<User, String> {
+	List<User> findByLastName(String lastName);
+}
\ No newline at end of file
diff --git a/spring-data-dynamodb-examples/simple/src/main/resources/application.properties b/spring-data-dynamodb-examples/simple/src/main/resources/application.properties
new file mode 100644
index 00000000..5bd3ad98
--- /dev/null
+++ b/spring-data-dynamodb-examples/simple/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.data.dynamodb.entity2ddl.auto=create-only
diff --git a/spring-data-dynamodb-examples/simple/src/test/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepositoryIT.java b/spring-data-dynamodb-examples/simple/src/test/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepositoryIT.java
new file mode 100644
index 00000000..bf6de7a8
--- /dev/null
+++ b/spring-data-dynamodb-examples/simple/src/test/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepositoryIT.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb-examples-simple (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
+ *
+ * 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 com.github.derjust.spring_data_dynamodb_examples.simple;
+
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.socialsignin.spring.data.dynamodb.repository.config.EnableDynamoDBRepositories;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.regions.Regions;
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig;
+import com.amazonaws.services.dynamodbv2.model.DeleteTableRequest;
+import com.amazonaws.services.dynamodbv2.util.TableUtils;
+
+import static org.hamcrest.Matchers.*;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = {PropertyPlaceholderAutoConfiguration.class, UserRepositoryIT.DynamoDBConfig.class})
+public class UserRepositoryIT {
+	private static final Logger log = LoggerFactory.getLogger(UserRepositoryIT.class);
+
+	@Configuration
+	@EnableDynamoDBRepositories(basePackageClasses = UserRepository.class)
+	public static class DynamoDBConfig {
+
+		@Value("${amazon.aws.accesskey}")
+		private String amazonAWSAccessKey;
+
+		@Value("${amazon.aws.secretkey}")
+		private String amazonAWSSecretKey;
+
+		public AWSCredentialsProvider amazonAWSCredentialsProvider() {
+			return new AWSStaticCredentialsProvider(amazonAWSCredentials());
+		}
+
+		@Bean
+		public AWSCredentials amazonAWSCredentials() {
+			return new BasicAWSCredentials(amazonAWSAccessKey, amazonAWSSecretKey);
+		}
+
+		@Bean
+		public DynamoDBMapperConfig dynamoDBMapperConfig() {
+			return DynamoDBMapperConfig.DEFAULT;
+		}
+
+		@Bean
+		public DynamoDBMapper dynamoDBMapper(AmazonDynamoDB amazonDynamoDB, DynamoDBMapperConfig config) {
+			return new DynamoDBMapper(amazonDynamoDB, config);
+		}
+
+		@Bean
+		public AmazonDynamoDB amazonDynamoDB() {
+			return AmazonDynamoDBClientBuilder.standard().withCredentials(amazonAWSCredentialsProvider())
+					.withRegion(Regions.US_EAST_1).build();
+		}
+	}
+
+	@Autowired
+	private UserRepository repository;
+
+	@Test
+	public void sampleTestCase() {
+		User gosling = new User("James", "Gosling");
+		repository.save(gosling);
+
+		User hoeller = new User("Juergen", "Hoeller");
+		repository.save(hoeller);
+
+		List<User> result = repository.findByLastName("Gosling");
+		Assert.assertThat(result.size(), is(1));
+		Assert.assertThat(result, hasItem(gosling));
+		log.info("Found in table: {}", result.get(0));
+	}
+
+	@Autowired
+	private AmazonDynamoDB amazonDynamoDB;
+	@Autowired
+	private DynamoDBMapper mapper;
+	private boolean tableWasCreatedForTest;
+
+	@After
+	public void destroy() throws Exception {
+		if (tableWasCreatedForTest) {
+			DeleteTableRequest dtr = mapper.generateDeleteTableRequest(User.class);
+			TableUtils.deleteTableIfExists(amazonDynamoDB, dtr);
+			log.info("Deleted table {}", dtr.getTableName());
+		}
+	}
+}
diff --git a/spring-data-dynamodb/pom.xml b/spring-data-dynamodb/pom.xml
new file mode 100755
index 00000000..0f9080cb
--- /dev/null
+++ b/spring-data-dynamodb/pom.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.github.derjust</groupId>
+        <artifactId>spring-data-dynamodb-parent</artifactId>
+        <version>5.1.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>spring-data-dynamodb</artifactId>
+    <name>Spring Data DynamoDB</name>
+
+    <dependencies>
+        <!-- SPRING -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>
+
+        <!-- SPRING DATA -->
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+        </dependency>
+
+        <!-- DynamoDB -->
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-dynamodb</artifactId>
+        </dependency>
+
+        <!-- CDI -->
+        <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <version>${cdi.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- TEST -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>DynamoDBLocal</artifactId>
+            <scope>test</scope>
+       </dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-to-slf4j</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+	        <groupId>org.tuxdude.logback.extensions</groupId>
+	        <artifactId>logback-colorizer</artifactId>
+	        <scope>test</scope>
+		</dependency>
+        <dependency>
+            <groupId>uk.org.lidalia</groupId>
+            <artifactId>slf4j-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+
+    <build>
+        <plugins>
+          <!-- must be specified otherwise it is not executed -->
+          <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-failsafe-plugin</artifactId>
+                </plugin>
+                <!-- must be specified otherwise it is not executed -->
+                  <plugin>
+                      <groupId>org.apache.maven.plugins</groupId>
+                      <artifactId>maven-dependency-plugin</artifactId>
+                    </plugin>
+              </plugins>
+            </build>
+ 
+</project>
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/config/AbstractDynamoDBConfiguration.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/AbstractDynamoDBConfiguration.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/config/AbstractDynamoDBConfiguration.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/AbstractDynamoDBConfiguration.java
index 23de4474..b6592e7d 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/config/AbstractDynamoDBConfiguration.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/AbstractDynamoDBConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/config/BeanNames.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/BeanNames.java
similarity index 94%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/config/BeanNames.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/BeanNames.java
index 3743ae5e..9363bd45 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/config/BeanNames.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/BeanNames.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParser.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParser.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParser.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParser.java
index 787acb36..19081f01 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParser.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrar.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrar.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrar.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrar.java
index 24942a96..cd61890e 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrar.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrar.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/config/EnableDynamoDBAuditing.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/EnableDynamoDBAuditing.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/config/EnableDynamoDBAuditing.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/EnableDynamoDBAuditing.java
index 521313ee..a75d3b40 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/config/EnableDynamoDBAuditing.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/EnableDynamoDBAuditing.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBOperations.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBOperations.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBOperations.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBOperations.java
index 86bf9944..628772ca 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBOperations.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBOperations.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplate.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplate.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplate.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplate.java
index a31d0cd7..4add6573 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplate.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplate.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImpl.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImpl.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImpl.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImpl.java
index f8d0a8d7..4fe202b4 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImpl.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchDeleteException.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchDeleteException.java
similarity index 94%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchDeleteException.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchDeleteException.java
index 6006b1fb..8870af38 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchDeleteException.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchDeleteException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchWriteException.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchWriteException.java
similarity index 94%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchWriteException.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchWriteException.java
index 6ce185c2..6a3a9f36 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchWriteException.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchWriteException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/AbstractDynamoDBDateMarshaller.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/AbstractDynamoDBDateMarshaller.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/AbstractDynamoDBDateMarshaller.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/AbstractDynamoDBDateMarshaller.java
index 320680e0..bef9df32 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/AbstractDynamoDBDateMarshaller.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/AbstractDynamoDBDateMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshaller.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshaller.java
similarity index 96%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshaller.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshaller.java
index bc885dd2..fd256445 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshaller.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContext.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContext.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContext.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContext.java
index 446feff1..de8dbf9c 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContext.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContext.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntity.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntity.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntity.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntity.java
index 6868a800..126b35f8 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntity.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntity.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityImpl.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityImpl.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityImpl.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityImpl.java
index d04f2bc2..27680edc 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityImpl.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentProperty.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentProperty.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentProperty.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentProperty.java
index f85562c8..a259470f 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentProperty.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentProperty.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImpl.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImpl.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImpl.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImpl.java
index 55b88874..0e5774e0 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImpl.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListener.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListener.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListener.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListener.java
index 7873d5d6..04fc9d19 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListener.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterDeleteEvent.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterDeleteEvent.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterDeleteEvent.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterDeleteEvent.java
index 6758f744..4f6a5c5a 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterDeleteEvent.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterDeleteEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterLoadEvent.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterLoadEvent.java
similarity index 94%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterLoadEvent.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterLoadEvent.java
index 34d714a4..e0bf58af 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterLoadEvent.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterLoadEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterQueryEvent.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterQueryEvent.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterQueryEvent.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterQueryEvent.java
index e59502af..f0ced938 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterQueryEvent.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterQueryEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterSaveEvent.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterSaveEvent.java
similarity index 94%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterSaveEvent.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterSaveEvent.java
index 0c14fc61..b41b0a2b 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterSaveEvent.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterSaveEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterScanEvent.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterScanEvent.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterScanEvent.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterScanEvent.java
index 03acbe56..a525a7aa 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterScanEvent.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterScanEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AuditingEventListener.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AuditingEventListener.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AuditingEventListener.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AuditingEventListener.java
index a1f946f2..3bd1ab14 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AuditingEventListener.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AuditingEventListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeDeleteEvent.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeDeleteEvent.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeDeleteEvent.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeDeleteEvent.java
index 5e790ee2..5d71858f 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeDeleteEvent.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeDeleteEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeSaveEvent.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeSaveEvent.java
similarity index 94%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeSaveEvent.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeSaveEvent.java
index 9eba570c..ed280fa6 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeSaveEvent.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeSaveEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/DynamoDBMappingEvent.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/DynamoDBMappingEvent.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/DynamoDBMappingEvent.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/DynamoDBMappingEvent.java
index 1c13ca3e..4b62fef3 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/DynamoDBMappingEvent.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/DynamoDBMappingEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListener.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListener.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListener.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListener.java
index 35a9c07f..4a741409 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListener.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListener.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListener.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListener.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListener.java
index d610a957..ce3bc237 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListener.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshaller.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshaller.java
similarity index 96%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshaller.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshaller.java
index e8ed42a0..2507bb34 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshaller.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshaller.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshaller.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshaller.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshaller.java
index db76d22d..c958efe6 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshaller.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/DateDynamoDBMarshaller.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/DateDynamoDBMarshaller.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/DateDynamoDBMarshaller.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/DateDynamoDBMarshaller.java
index f1018335..a4a1d158 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/DateDynamoDBMarshaller.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/DateDynamoDBMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshaller.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshaller.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshaller.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshaller.java
index ae7c016a..2674c9f8 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshaller.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshaller.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshaller.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshaller.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshaller.java
index 6372c38e..ca1e45e4 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshaller.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQuery.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQuery.java
index 9fb25af2..c9d1b94c 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQuery.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQuery.java
index 426d1f49..1703abc2 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractQuery.java
similarity index 96%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractQuery.java
index 10e6d679..87d3e0a3 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQuery.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQuery.java
index 02612143..1dbef82d 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQuery.java
similarity index 96%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQuery.java
index a7743d92..7da2e849 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQuery.java
similarity index 96%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQuery.java
index 7994c815..d6c194c0 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryExpressionQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryExpressionQuery.java
similarity index 96%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryExpressionQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryExpressionQuery.java
index 806ab34f..facf14be 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryExpressionQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryExpressionQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryRequestQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryRequestQuery.java
similarity index 96%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryRequestQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryRequestQuery.java
index 8b12e7c9..179b43b3 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryRequestQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryRequestQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityScanExpressionQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityScanExpressionQuery.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityScanExpressionQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityScanExpressionQuery.java
index c42805fd..10935424 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityScanExpressionQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityScanExpressionQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/Query.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/Query.java
similarity index 96%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/query/Query.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/Query.java
index 03d48f44..9356512a 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/Query.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/Query.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQuery.java
similarity index 96%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQuery.java
index 66cee462..a4b71749 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQuery.java
similarity index 96%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQuery.java
index f7802974..b020ad9b 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQuery.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQuery.java
index af9a4519..5c87c6a7 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashAndRangeKeyQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashAndRangeKeyQuery.java
similarity index 96%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashAndRangeKeyQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashAndRangeKeyQuery.java
index 7e17543d..9693396b 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashAndRangeKeyQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashAndRangeKeyQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashKeyQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashKeyQuery.java
similarity index 96%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashKeyQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashKeyQuery.java
index cfb6011f..27b745ba 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashKeyQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashKeyQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/query/StaticQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/StaticQuery.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/query/StaticQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/StaticQuery.java
index e7d21e41..ce502978 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/query/StaticQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/StaticQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBCrudRepository.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBCrudRepository.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBCrudRepository.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBCrudRepository.java
index 9818a176..8ef0d7a1 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBCrudRepository.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBCrudRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKey.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKey.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKey.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKey.java
index eaf91edf..bac1eaed 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKey.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKey.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBPagingAndSortingRepository.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBPagingAndSortingRepository.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBPagingAndSortingRepository.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBPagingAndSortingRepository.java
index ec187b46..03e99c37 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBPagingAndSortingRepository.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBPagingAndSortingRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScan.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScan.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScan.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScan.java
index 3fc76e51..60c00fad 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScan.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScan.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScanCount.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScanCount.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScanCount.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScanCount.java
index 09a26321..7278be40 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScanCount.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScanCount.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java
index 02284822..3121b3db 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/QueryConstants.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/QueryConstants.java
similarity index 94%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/QueryConstants.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/QueryConstants.java
index 313a7094..b8317a71 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/QueryConstants.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/QueryConstants.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBean.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBean.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBean.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBean.java
index 5104a68f..4deb8ece 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBean.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBean.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryExtension.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryExtension.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryExtension.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryExtension.java
index 9c7c915a..da112288 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryExtension.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryExtension.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/package-info.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/package-info.java
similarity index 93%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/package-info.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/package-info.java
index 20b51ffa..d2a1f3b1 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/package-info.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/package-info.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactory.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactory.java
new file mode 100644
index 00000000..e85e62dd
--- /dev/null
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactory.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ *
+ * 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 org.socialsignin.spring.data.dynamodb.repository.config;
+
+import org.springframework.beans.factory.FactoryBean;
+
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig;
+
+public class DynamoDBMapperConfigFactory implements FactoryBean<DynamoDBMapperConfig> {
+	
+	@Override
+	public DynamoDBMapperConfig getObject() throws Exception {
+		return DynamoDBMapperConfig.DEFAULT;
+	}
+
+	@Override
+	public Class<?> getObjectType() {
+		return DynamoDBMapperConfig.class;
+	}
+
+}
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactory.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigPostProcessor.java
similarity index 69%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactory.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigPostProcessor.java
index 36340e56..33de35df 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactory.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigPostProcessor.java
@@ -1,42 +1,15 @@
-/**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
- *
- * 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 org.socialsignin.spring.data.dynamodb.repository.config;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.lang.Nullable;
 
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig;
 
-public class DynamoDBMapperConfigFactory implements FactoryBean<DynamoDBMapperConfig>, BeanPostProcessor {
-	private static final Logger LOGGER = LoggerFactory.getLogger(DynamoDBMapperConfigFactory.class);
-	@Override
-	public DynamoDBMapperConfig getObject() throws Exception {
-		return DynamoDBMapperConfig.DEFAULT;
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return DynamoDBMapperConfig.class;
-	}
+public class DynamoDBMapperConfigPostProcessor implements BeanPostProcessor {
+	private static final Logger LOGGER = LoggerFactory.getLogger(DynamoDBMapperConfigPostProcessor.class);
 
-	@Nullable
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 		if (bean instanceof DynamoDBMapperConfig) {
 			DynamoDBMapperConfig dynamoDBMapperConfig = (DynamoDBMapperConfig) bean;
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperFactory.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperFactory.java
similarity index 89%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperFactory.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperFactory.java
index 20486acc..0562b644 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperFactory.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,14 +24,16 @@
 
 public class DynamoDBMapperFactory implements FactoryBean<DynamoDBMapper> {
 
-	private final AmazonDynamoDB amazonDynamoDB;
-	private final DynamoDBMapperConfig dynamoDBMapperConfig;
-
 	@Autowired
+	private AmazonDynamoDB amazonDynamoDB;
+	@Autowired
+	private DynamoDBMapperConfig dynamoDBMapperConfig;
+
+/*	@Autowired
 	public DynamoDBMapperFactory(AmazonDynamoDB amazonDynamoDB, DynamoDBMapperConfig dynamoDBMapperConfig) {
 		this.amazonDynamoDB = amazonDynamoDB;
 		this.dynamoDBMapperConfig = dynamoDBMapperConfig;
-	}
+	}*/
 
 	@Override
 	public DynamoDBMapper getObject() throws Exception {
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoriesRegistrar.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoriesRegistrar.java
similarity index 96%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoriesRegistrar.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoriesRegistrar.java
index 37c15daa..63ee4b94 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoriesRegistrar.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoriesRegistrar.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java
similarity index 76%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java
index 3cce9e03..f7f8df6f 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,9 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.socialsignin.spring.data.dynamodb.core.DynamoDBTemplate;
@@ -25,9 +27,14 @@
 import org.socialsignin.spring.data.dynamodb.repository.support.DynamoDBRepositoryFactoryBean;
 import org.socialsignin.spring.data.dynamodb.repository.util.DynamoDBMappingContextProcessor;
 import org.socialsignin.spring.data.dynamodb.repository.util.Entity2DynamoDBTableSynchronizer;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.core.annotation.AnnotationAttributes;
+import org.springframework.core.type.MethodMetadata;
 import org.springframework.data.config.ParsingUtils;
 import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;
 import org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport;
@@ -37,6 +44,10 @@
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig;
+
 /**
  * @author Michael Lavelle
  * @author Sebastian Just
@@ -122,15 +133,14 @@ private void postProcess(BeanDefinitionBuilder builder, String repositoryName, S
 				if (StringUtils.hasText(amazonDynamoDBRef)) {
 					dynamoDBRef = amazonDynamoDBRef;
 				} else {
-					dynamoDBRef = DEFAULT_AMAZON_DYNAMO_DB_BEAN_NAME;
+					dynamoDBRef = findBeanName(AmazonDynamoDB.class).orElseThrow(() -> 
+					new NoSuchBeanDefinitionException(AmazonDynamoDB.class, "A bean of type AmazonDynamoDB must be provided!"));
 				}
 
 				dynamoDBOperationsRef = dynamoDBTemplateCache
 						.computeIfAbsent(getBeanNameWithModulePrefix("DynamoDBTemplate-" + dynamoDBRef), ref -> {
 							BeanDefinitionBuilder dynamoDBTemplateBuilder = BeanDefinitionBuilder
 									.genericBeanDefinition(DynamoDBTemplate.class);
-							// AmazonDynamoDB amazonDynamoDB, DynamoDBMapper dynamoDBMapper,
-							// DynamoDBMapperConfig dynamoDBMapperConfig
 							dynamoDBTemplateBuilder.addConstructorArgReference(dynamoDBRef);
 							dynamoDBTemplateBuilder.addConstructorArgReference(this.dynamoDBMapperName);
 
@@ -222,12 +232,39 @@ private String registerDynamoDBMappingContext(BeanDefinitionRegistry registry) {
 
 		LOGGER.debug("Adding bean <{}> of type <{}>", dynamoDBMappingContextRef,
 				dynamoDBMappingContextBuilder.getBeanDefinition());
-
-		registry.registerBeanDefinition(dynamoDBMappingContextRef, dynamoDBMappingContextBuilder.getBeanDefinition());
+		registry.registerBeanDefinition(dynamoDBMappingContextRef, augmentContext(dynamoDBMappingContextBuilder));
 
 		return dynamoDBMappingContextRef;
 	}
-
+	
+	private AbstractBeanDefinition augmentContext(BeanDefinitionBuilder beanDefinitionBuilder) {
+		AbstractBeanDefinition beanDefinition = beanDefinitionBuilder.getBeanDefinition();
+		beanDefinition.setResourceDescription(getClass().getName());
+		return beanDefinition;
+	}
+	
+	private Optional<String> findBeanName(Class<?> requiredType) {
+		final String requiredClassName = requiredType.getName();
+		for(String bn : registry.getBeanDefinitionNames()) {
+
+			BeanDefinition bd = registry.getBeanDefinition(bn);
+			String beanClass = bd.getBeanClassName();
+
+			if (requiredClassName.equals(beanClass)) {
+				return Optional.of(bn);
+			} else if (beanClass == null && ((bd instanceof AnnotatedBeanDefinition))) {
+				MethodMetadata meta = ((AnnotatedBeanDefinition)bd).getFactoryMethodMetadata();
+				beanClass = meta.getReturnTypeName();
+				
+				if (requiredClassName.contentEquals(beanClass)) {
+					return Optional.of(bn);
+				}
+			}
+		}
+		
+		return Optional.empty();
+	}
+	
 	@Override
 	public void registerBeansForRoot(BeanDefinitionRegistry registry,
 			RepositoryConfigurationSource configurationSource) {
@@ -235,18 +272,33 @@ public void registerBeansForRoot(BeanDefinitionRegistry registry,
 
 		// Store for later to be used by #postProcess, too
 		this.registry = registry;
-
-		this.dynamoDBMapperConfigName = getBeanNameWithModulePrefix("DynamoDBMapperConfig");
-		// TODO only if it doesn't exist
-		BeanDefinitionBuilder dynamoDBMapperConfigBuiilder = BeanDefinitionBuilder
-				.genericBeanDefinition(DynamoDBMapperConfigFactory.class);
-		registry.registerBeanDefinition(this.dynamoDBMapperConfigName,
-				dynamoDBMapperConfigBuiilder.getBeanDefinition());
-
-		this.dynamoDBMapperName = getBeanNameWithModulePrefix("DynamoDBMapper");
-		BeanDefinitionBuilder dynamoDBMapperBuilder = BeanDefinitionBuilder
-				.genericBeanDefinition(DynamoDBMapperFactory.class);
-		registry.registerBeanDefinition(this.dynamoDBMapperName, dynamoDBMapperBuilder.getBeanDefinition());
+		
+		BeanDefinitionBuilder dynamoDBMapperConfigPostProcessorBuilder = BeanDefinitionBuilder
+				.genericBeanDefinition(DynamoDBMapperConfigPostProcessor.class);
+		registry.registerBeanDefinition(getBeanNameWithModulePrefix("DynamoDBMapperConfigPostProcessor"), augmentContext(dynamoDBMapperConfigPostProcessorBuilder));
+		
+		
+		// Add missing beans if required 
+		// TODO this should all go away with the separation into 
+		// Core, Boot and CDI with the next Spring update
+		this.dynamoDBMapperConfigName = findBeanName(DynamoDBMapperConfig.class).orElseGet(() -> {
+			String dynamoDBMapperConfigName = getBeanNameWithModulePrefix("DynamoDBMapperConfig");
+			BeanDefinitionBuilder dynamoDBMapperConfigBuilder = BeanDefinitionBuilder
+					.genericBeanDefinition(DynamoDBMapperConfigFactory.class);
+			registry.registerBeanDefinition(dynamoDBMapperConfigName, augmentContext(dynamoDBMapperConfigBuilder));
+
+			return dynamoDBMapperConfigName;
+		});
+		
+		
+		this.dynamoDBMapperName = findBeanName(DynamoDBMapper.class).orElseGet(() -> {
+			String dynamoDBMapperName = getBeanNameWithModulePrefix("DynamoDBMapper");
+			BeanDefinitionBuilder dynamoDBMapperBuilder = BeanDefinitionBuilder
+					.genericBeanDefinition(DynamoDBMapperFactory.class);
+
+			registry.registerBeanDefinition(dynamoDBMapperName, augmentContext(dynamoDBMapperBuilder));
+			return dynamoDBMapperName;
+		});
 	}
 
 	protected String getBeanNameWithModulePrefix(String baseBeanName) {
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryNameSpaceHandler.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryNameSpaceHandler.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryNameSpaceHandler.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryNameSpaceHandler.java
index 9900cc76..51b7241c 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryNameSpaceHandler.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryNameSpaceHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/EnableDynamoDBRepositories.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/EnableDynamoDBRepositories.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/EnableDynamoDBRepositories.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/EnableDynamoDBRepositories.java
index a5e68afc..f07af56d 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/EnableDynamoDBRepositories.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/EnableDynamoDBRepositories.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQuery.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQuery.java
index 67739bfb..12a2f688 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCreator.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCreator.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCreator.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCreator.java
index 610bf683..e1d66042 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCreator.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCreator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteria.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteria.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteria.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteria.java
index a14ec0bc..d8c58b5b 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteria.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteria.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBCountQueryCreator.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBCountQueryCreator.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBCountQueryCreator.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBCountQueryCreator.java
index bcb99057..6581b3b3 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBCountQueryCreator.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBCountQueryCreator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteria.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteria.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteria.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteria.java
index 0b1e3ff4..4d72eb6b 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteria.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteria.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteria.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteria.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteria.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteria.java
index e2747652..736edcc4 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteria.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteria.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCreator.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCreator.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCreator.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCreator.java
index 423cfd0f..9792d36f 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCreator.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCreator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCriteria.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCriteria.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCriteria.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCriteria.java
index b10ae548..24010e23 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCriteria.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCriteria.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategy.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategy.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategy.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategy.java
index 53406444..a2c9d049 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategy.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategy.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryMethod.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryMethod.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryMethod.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryMethod.java
index c2e9afe0..c7df8e15 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryMethod.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryMethod.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQuery.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQuery.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQuery.java
index bafb592f..0bb9a3c2 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/CompositeIdHashAndRangeKeyExtractor.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/CompositeIdHashAndRangeKeyExtractor.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/CompositeIdHashAndRangeKeyExtractor.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/CompositeIdHashAndRangeKeyExtractor.java
index 785ae899..62000d9f 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/CompositeIdHashAndRangeKeyExtractor.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/CompositeIdHashAndRangeKeyExtractor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityInformation.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityInformation.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityInformation.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityInformation.java
index c5f664b3..4e336085 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityInformation.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityInformation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupport.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupport.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupport.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupport.java
index feffe022..cad5fe51 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupport.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupport.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadata.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadata.java
similarity index 96%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadata.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadata.java
index 7e678c7b..2c58df76 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadata.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadata.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadataImpl.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadataImpl.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadataImpl.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadataImpl.java
index 4a3a4387..df636a05 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadataImpl.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadataImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractor.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractor.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractor.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractor.java
index 4e66a88e..b1605e09 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractor.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImpl.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImpl.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImpl.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImpl.java
index 2d271377..bbeae105 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImpl.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashKeyExtractingEntityMetadata.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashKeyExtractingEntityMetadata.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashKeyExtractingEntityMetadata.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashKeyExtractingEntityMetadata.java
index fcb15db7..1e2145cd 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashKeyExtractingEntityMetadata.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashKeyExtractingEntityMetadata.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformation.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformation.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformation.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformation.java
index 2ce77299..d7f6674d 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformation.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImpl.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImpl.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImpl.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImpl.java
index 7a6ed7e7..e1128059 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImpl.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImpl.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImpl.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImpl.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImpl.java
index 5c6d3c84..7b652562 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImpl.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactory.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactory.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactory.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactory.java
index 81b6e0c2..8b4a94e0 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactory.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBean.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBean.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBean.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBean.java
index 66f46624..cfac2a56 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBean.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBean.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissions.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissions.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissions.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissions.java
index d8c8a56e..845fc6a9 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissions.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissions.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanPermissions.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanPermissions.java
similarity index 95%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanPermissions.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanPermissions.java
index de26ddea..6a1ac4f2 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanPermissions.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanPermissions.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/FieldAndGetterReflectionEntityInformation.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/FieldAndGetterReflectionEntityInformation.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/FieldAndGetterReflectionEntityInformation.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/FieldAndGetterReflectionEntityInformation.java
index b3f5a4c3..0e9692e6 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/FieldAndGetterReflectionEntityInformation.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/FieldAndGetterReflectionEntityInformation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashAndRangeKeyExtractor.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashAndRangeKeyExtractor.java
similarity index 94%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashAndRangeKeyExtractor.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashAndRangeKeyExtractor.java
index de063c4a..e28bd14c 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashAndRangeKeyExtractor.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashAndRangeKeyExtractor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyExtractor.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyExtractor.java
similarity index 94%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyExtractor.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyExtractor.java
index aa451455..ee67077f 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyExtractor.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyExtractor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyIsIdHashKeyExtractor.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyIsIdHashKeyExtractor.java
similarity index 96%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyIsIdHashKeyExtractor.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyIsIdHashKeyExtractor.java
index bb406dec..54b8e2d9 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyIsIdHashKeyExtractor.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyIsIdHashKeyExtractor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepository.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepository.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepository.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepository.java
index 05dfa0cd..59d4d696 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepository.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepository.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepository.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepository.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepository.java
index 3950242e..91cbf47f 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepository.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/DynamoDBMappingContextProcessor.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/DynamoDBMappingContextProcessor.java
similarity index 96%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/DynamoDBMappingContextProcessor.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/DynamoDBMappingContextProcessor.java
index 8800cc03..ec1aa288 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/DynamoDBMappingContextProcessor.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/DynamoDBMappingContextProcessor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDL.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDL.java
similarity index 98%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDL.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDL.java
index 9795aa3c..59d743eb 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDL.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDL.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizer.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizer.java
similarity index 99%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizer.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizer.java
index 51595528..5e1ec743 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizer.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/EntityInformationProxyPostProcessor.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/EntityInformationProxyPostProcessor.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/EntityInformationProxyPostProcessor.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/EntityInformationProxyPostProcessor.java
index 19f75dba..9f3e01fe 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/EntityInformationProxyPostProcessor.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/EntityInformationProxyPostProcessor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandler.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandler.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandler.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandler.java
index d3049ae0..5ed69e44 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandler.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/socialsignin/spring/data/dynamodb/utils/SortHandler.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/utils/SortHandler.java
similarity index 97%
rename from src/main/java/org/socialsignin/spring/data/dynamodb/utils/SortHandler.java
rename to spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/utils/SortHandler.java
index 1280101e..16923631 100644
--- a/src/main/java/org/socialsignin/spring/data/dynamodb/utils/SortHandler.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/utils/SortHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/spring-data-dynamodb/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
similarity index 100%
rename from src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to spring-data-dynamodb/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
diff --git a/src/main/resources/META-INF/spring.handlers b/spring-data-dynamodb/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from src/main/resources/META-INF/spring.handlers
rename to spring-data-dynamodb/src/main/resources/META-INF/spring.handlers
diff --git a/src/main/resources/META-INF/spring.schemas b/spring-data-dynamodb/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from src/main/resources/META-INF/spring.schemas
rename to spring-data-dynamodb/src/main/resources/META-INF/spring.schemas
diff --git a/src/main/resources/META-INF/spring.tooling b/spring-data-dynamodb/src/main/resources/META-INF/spring.tooling
similarity index 100%
rename from src/main/resources/META-INF/spring.tooling
rename to spring-data-dynamodb/src/main/resources/META-INF/spring.tooling
diff --git a/src/main/resources/org/socialsignin/spring/data/dynamodb/repository/config/spring-dynamodb-1.0.xsd b/spring-data-dynamodb/src/main/resources/org/socialsignin/spring/data/dynamodb/repository/config/spring-dynamodb-1.0.xsd
similarity index 100%
rename from src/main/resources/org/socialsignin/spring/data/dynamodb/repository/config/spring-dynamodb-1.0.xsd
rename to spring-data-dynamodb/src/main/resources/org/socialsignin/spring/data/dynamodb/repository/config/spring-dynamodb-1.0.xsd
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingIntegrationTests.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingIntegrationTests.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingIntegrationTests.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingIntegrationTests.java
index 3fc12a15..95a03301 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingIntegrationTests.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingIntegrationTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingViaJavaConfigRepositoriesIT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingViaJavaConfigRepositoriesIT.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingViaJavaConfigRepositoriesIT.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingViaJavaConfigRepositoriesIT.java
index b1ead7fb..b4b6c633 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingViaJavaConfigRepositoriesIT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingViaJavaConfigRepositoriesIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParserTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParserTest.java
similarity index 99%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParserTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParserTest.java
index fa66782b..0b2d1fa0 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParserTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParserTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrarUnitTests.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrarUnitTests.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrarUnitTests.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrarUnitTests.java
index 850ada3e..c384b0f8 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrarUnitTests.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrarUnitTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/core/ConfigurationTI.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/ConfigurationTI.java
similarity index 95%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/core/ConfigurationTI.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/ConfigurationTI.java
index 0f777f3f..49224a0c 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/core/ConfigurationTI.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/ConfigurationTI.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/core/CustomerHistoryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/CustomerHistoryIT.java
similarity index 93%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/core/CustomerHistoryTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/CustomerHistoryIT.java
index 1147682a..ef0ead52 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/core/CustomerHistoryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/CustomerHistoryIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,9 +33,9 @@
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
-@ContextConfiguration(classes = {CustomerHistoryTest.TestAppConfig.class, DynamoDBLocalResource.class})
+@ContextConfiguration(classes = {CustomerHistoryIT.TestAppConfig.class, DynamoDBLocalResource.class})
 @TestPropertySource(properties = {"spring.data.dynamodb.entity2ddl.auto=create"})
-public class CustomerHistoryTest {
+public class CustomerHistoryIT {
 
 	@Configuration
 	@EnableDynamoDBRepositories(basePackages = "org.socialsignin.spring.data.dynamodb.domain.sample")
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateIT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateIT.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateIT.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateIT.java
index ab41186a..409430c5 100755
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateIT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateTest.java
similarity index 99%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateTest.java
index e25ed1e7..054d94ed 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/core/FeedUserIT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/FeedUserIT.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/core/FeedUserIT.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/FeedUserIT.java
index bec3d373..64220304 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/core/FeedUserIT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/FeedUserIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/core/SortPageableIT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/SortPageableIT.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/core/SortPageableIT.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/SortPageableIT.java
index 4f1ef6a8..76ca2332 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/core/SortPageableIT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/SortPageableIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImplTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImplTest.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImplTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImplTest.java
index 8cfc9b32..ffe28846 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImplTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImplTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUser.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUser.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUser.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUser.java
index d98711f0..bf74f3bf 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUser.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUser.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUserRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUserRepository.java
similarity index 94%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUserRepository.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUserRepository.java
index 7c6f9cc2..08d348e2 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUserRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUserRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CRUDOperationsIT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CRUDOperationsIT.java
similarity index 99%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CRUDOperationsIT.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CRUDOperationsIT.java
index ffe4f9a4..fa002b15 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CRUDOperationsIT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CRUDOperationsIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocument.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocument.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocument.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocument.java
index e8995ca9..2f0dfd80 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocument.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocument.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentIT.java
similarity index 93%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentIT.java
index 78fffe0e..f32c602b 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,9 +28,9 @@
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @DirtiesContext
-@ContextConfiguration(classes = {DynamoDBLocalResource.class, CustomerDocumentTest.TestAppConfig.class})
+@ContextConfiguration(classes = {DynamoDBLocalResource.class, CustomerDocumentIT.TestAppConfig.class})
 @TestPropertySource(properties = {"spring.data.dynamodb.entity2ddl.auto=create"})
-public class CustomerDocumentTest {
+public class CustomerDocumentIT {
 
 	@Configuration
 	@EnableDynamoDBRepositories(basePackages = "org.socialsignin.spring.data.dynamodb.domain.sample")
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentId.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentId.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentId.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentId.java
index 737a5cc0..e0830eb0 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentId.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentId.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentRepository.java
similarity index 96%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentRepository.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentRepository.java
index bb2a8296..beb716a2 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistory.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistory.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistory.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistory.java
index c3ed3b80..7b708cf2 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistory.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryId.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryId.java
similarity index 96%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryId.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryId.java
index cf1e81f8..3b9e275b 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryId.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryId.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryRepository.java
similarity index 94%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryRepository.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryRepository.java
index 4105481a..2ccb331a 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/DynamoDBYearMarshaller.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/DynamoDBYearMarshaller.java
similarity index 95%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/DynamoDBYearMarshaller.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/DynamoDBYearMarshaller.java
index 54509bc3..d4d59eb8 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/DynamoDBYearMarshaller.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/DynamoDBYearMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Feed.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Feed.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Feed.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Feed.java
index 53074f75..2b961125 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Feed.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Feed.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedPagingRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedPagingRepository.java
similarity index 96%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedPagingRepository.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedPagingRepository.java
index 6cd0e75d..12fcdc14 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedPagingRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedPagingRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUser.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUser.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUser.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUser.java
index 1cea3e95..36337354 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUser.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUser.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUserRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUserRepository.java
similarity index 95%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUserRepository.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUserRepository.java
index 75bb5c16..b91776e7 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUserRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUserRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/GlobalSecondaryIndexWithRangeKeyIT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/GlobalSecondaryIndexWithRangeKeyIT.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/GlobalSecondaryIndexWithRangeKeyIT.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/GlobalSecondaryIndexWithRangeKeyIT.java
index 27a48d66..9a59f286 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/GlobalSecondaryIndexWithRangeKeyIT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/GlobalSecondaryIndexWithRangeKeyIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/HashRangeKeyIT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/HashRangeKeyIT.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/HashRangeKeyIT.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/HashRangeKeyIT.java
index f94c9dd1..63c5ae8f 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/HashRangeKeyIT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/HashRangeKeyIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Installation.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Installation.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Installation.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Installation.java
index 453f5d80..4f5a51b0 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Installation.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Installation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/InstallationRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/InstallationRepository.java
similarity index 95%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/InstallationRepository.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/InstallationRepository.java
index 3c9bc9ca..9d029d70 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/InstallationRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/InstallationRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Jdk8IT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Jdk8IT.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Jdk8IT.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Jdk8IT.java
index c4c45af1..fff46e33 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Jdk8IT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Jdk8IT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Playlist.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Playlist.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Playlist.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Playlist.java
index 92cc5423..8a4052db 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Playlist.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Playlist.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistId.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistId.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistId.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistId.java
index a6555acd..eeb5433f 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistId.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistId.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistRepository.java
similarity index 94%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistRepository.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistRepository.java
index 9864df72..5942f618 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/User.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/User.java
similarity index 99%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/User.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/User.java
index e23daacf..93335666 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/User.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/User.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserPaginationRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserPaginationRepository.java
similarity index 96%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserPaginationRepository.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserPaginationRepository.java
index 97ec0b28..7825dfb1 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserPaginationRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserPaginationRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java
index 69aaf4c6..e4e5c43e 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshallerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshallerTest.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshallerTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshallerTest.java
index 050b8c4d..7b2ac81e 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshallerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshallerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContextTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContextTest.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContextTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContextTest.java
index 967829f5..470f44f8 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContextTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContextTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityTest.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityTest.java
index 2ccb67eb..2a00bdbe 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImplUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImplUnitTest.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImplUnitTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImplUnitTest.java
index 41bd2081..1154d67b 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImplUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImplUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListenerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListenerTest.java
similarity index 99%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListenerTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListenerTest.java
index 3bcc879f..a5464015 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListenerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListenerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListenerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListenerTest.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListenerTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListenerTest.java
index 8200a5b0..beee0786 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListenerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListenerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListenerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListenerTest.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListenerTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListenerTest.java
index 640175df..ca42e386 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListenerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListenerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshallerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshallerTest.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshallerTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshallerTest.java
index 593177a4..38d8765b 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshallerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshallerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshallerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshallerTest.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshallerTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshallerTest.java
index 3d3c0df2..f5bcfe11 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshallerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshallerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshallerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshallerTest.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshallerTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshallerTest.java
index abeb1c0f..30acdbd6 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshallerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshallerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshallerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshallerTest.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshallerTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshallerTest.java
index 2872697f..f4e16cec 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshallerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshallerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQueryTest.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQueryTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQueryTest.java
index 841349b4..77e5fe04 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQueryTest.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQueryTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQueryTest.java
index b1c9ae7c..fe790e9f 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQueryTest.java
similarity index 96%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQueryTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQueryTest.java
index 4856923a..67a24388 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQueryTest.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQueryTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQueryTest.java
index 751a6df0..1a2f2a3a 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQueryTest.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQueryTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQueryTest.java
index 264d27b3..34db311e 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQueryTest.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQueryTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQueryTest.java
index 0c7e3def..e2efe2d8 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQueryTest.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQueryTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQueryTest.java
index 40599e06..9bef8f4b 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQueryTest.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQueryTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQueryTest.java
index 0871692a..1756f203 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKeyTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKeyTest.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKeyTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKeyTest.java
index 8c828a05..ab948392 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKeyTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKeyTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBeanTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBeanTest.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBeanTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBeanTest.java
index dc099912..9baa3181 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBeanTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBeanTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactoryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigPostProcessorTest.java
similarity index 94%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactoryTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigPostProcessorTest.java
index e168dad2..30acc496 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactoryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigPostProcessorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 import static org.junit.Assert.assertSame;
 
 @RunWith(MockitoJUnitRunner.class)
-public class DynamoDBMapperConfigFactoryTest {
+public class DynamoDBMapperConfigPostProcessorTest {
 
 	@Mock
 	private DynamoDBMapper dynamoDBMapper;
@@ -38,11 +38,11 @@ public class DynamoDBMapperConfigFactoryTest {
 	@Mock
 	private AmazonDynamoDB dynamoDB;
 
-	DynamoDBMapperConfigFactory underTest;
+	DynamoDBMapperConfigPostProcessor underTest;
 
 	@Before
 	public void setUp() throws Exception {
-		underTest = new DynamoDBMapperConfigFactory();
+		underTest = new DynamoDBMapperConfigPostProcessor();
 	}
 
 	@Test
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteriaUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteriaUnitTest.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteriaUnitTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteriaUnitTest.java
index 0e8075ce..9754ca06 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteriaUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteriaUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryTest.java
similarity index 99%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryTest.java
index 63f95da7..803cd034 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/CaseChangingMarshaller.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/CaseChangingMarshaller.java
similarity index 95%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/CaseChangingMarshaller.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/CaseChangingMarshaller.java
index 54beca10..216279e8 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/CaseChangingMarshaller.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/CaseChangingMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteriaUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteriaUnitTest.java
similarity index 99%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteriaUnitTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteriaUnitTest.java
index 49a601d9..6bb32645 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteriaUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteriaUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteriaUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteriaUnitTest.java
similarity index 99%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteriaUnitTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteriaUnitTest.java
index 8005f105..96b5683e 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteriaUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteriaUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategyTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategyTest.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategyTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategyTest.java
index 1e13bbd8..c447c289 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategyTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategyTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQueryUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQueryUnitTest.java
similarity index 99%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQueryUnitTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQueryUnitTest.java
index 4afad944..b2bb4b6c 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQueryUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQueryUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupportUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupportUnitTest.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupportUnitTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupportUnitTest.java
index 367628f1..e425bbbb 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupportUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupportUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImplUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImplUnitTest.java
similarity index 99%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImplUnitTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImplUnitTest.java
index beb590e7..b26c07f8 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImplUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImplUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImplUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImplUnitTest.java
similarity index 99%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImplUnitTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImplUnitTest.java
index 803f31d0..dfb05e58 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImplUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImplUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImplUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImplUnitTest.java
similarity index 99%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImplUnitTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImplUnitTest.java
index 1ac491f6..859db268 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImplUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImplUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBeanTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBeanTest.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBeanTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBeanTest.java
index 2aa00671..2c3a1e9b 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBeanTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBeanTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryTest.java
similarity index 96%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryTest.java
index 184e1ad3..a0bf2aca 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissionTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissionTest.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissionTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissionTest.java
index acb045b9..11719768 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissionTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepositoryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepositoryTest.java
similarity index 99%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepositoryTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepositoryTest.java
index 6ea18ad1..259a9087 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepositoryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepositoryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepositoryUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepositoryUnitTest.java
similarity index 98%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepositoryUnitTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepositoryUnitTest.java
index 3cb7415d..28fd500e 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepositoryUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepositoryUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDLTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDLTest.java
similarity index 96%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDLTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDLTest.java
index a53d8667..78f2cc35 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDLTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDLTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizerTest.java
similarity index 99%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizerTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizerTest.java
index 953fdb0b..63136999 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBLocalResource.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBLocalResource.java
similarity index 96%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBLocalResource.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBLocalResource.java
index 11d4d0c3..25c890f6 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBLocalResource.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBLocalResource.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBResource.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBResource.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBResource.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBResource.java
index 67f64e03..51ff75cc 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBResource.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBResource.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandlerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandlerTest.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandlerTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandlerTest.java
index 287ba8b4..bf646474 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandlerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/utils/SortHandlerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/SortHandlerTest.java
similarity index 97%
rename from src/test/java/org/socialsignin/spring/data/dynamodb/utils/SortHandlerTest.java
rename to spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/SortHandlerTest.java
index d4cc95d0..1ddc32f4 100644
--- a/src/test/java/org/socialsignin/spring/data/dynamodb/utils/SortHandlerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/SortHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/resources/META-INF/context/HashRangeKeyIT-context.xml b/spring-data-dynamodb/src/test/resources/META-INF/context/HashRangeKeyIT-context.xml
similarity index 100%
rename from src/test/resources/META-INF/context/HashRangeKeyIT-context.xml
rename to spring-data-dynamodb/src/test/resources/META-INF/context/HashRangeKeyIT-context.xml
diff --git a/src/test/resources/logback.xml b/spring-data-dynamodb/src/test/resources/logback.xml
similarity index 53%
rename from src/test/resources/logback.xml
rename to spring-data-dynamodb/src/test/resources/logback.xml
index 30509a4f..a80248ea 100644
--- a/src/test/resources/logback.xml
+++ b/spring-data-dynamodb/src/test/resources/logback.xml
@@ -2,12 +2,20 @@
 <!DOCTYPE configuration>
 <configuration debug="false">
 
+<conversionRule conversionWord="colorize" converterClass="org.tuxdude.logback.extensions.LogColorizer" />
+<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+        <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %colorize(%msg)%n</pattern>
+    </encoder>
+</appender>
+<!-- 
+
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
       <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
     </encoder>
   </appender>
-
+ -->
   <root level="info">
     <appender-ref ref="STDOUT" />
   </root>
diff --git a/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/spring-data-dynamodb/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
similarity index 100%
rename from src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
rename to spring-data-dynamodb/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/src/test/resources/org/socialsignin/spring/data/dynamodb/config/auditing.xml b/spring-data-dynamodb/src/test/resources/org/socialsignin/spring/data/dynamodb/config/auditing.xml
similarity index 100%
rename from src/test/resources/org/socialsignin/spring/data/dynamodb/config/auditing.xml
rename to spring-data-dynamodb/src/test/resources/org/socialsignin/spring/data/dynamodb/config/auditing.xml
diff --git a/src/test/resources/slf4jtest.properties b/spring-data-dynamodb/src/test/resources/slf4jtest.properties
similarity index 100%
rename from src/test/resources/slf4jtest.properties
rename to spring-data-dynamodb/src/test/resources/slf4jtest.properties
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 38b70890..c39615b9 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+    Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/src/checkstyle.xml b/src/checkstyle.xml
index c7df88e4..92f70ca5 100644
--- a/src/checkstyle.xml
+++ b/src/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+    Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/src/pmd.xml b/src/pmd.xml
index 99d02401..c92e09f7 100644
--- a/src/pmd.xml
+++ b/src/pmd.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+    Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/src/site/site.xml b/src/site/site.xml
index ca9876b9..e5c13adc 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+    Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/src/spotbugs-exclude.xml b/src/spotbugs-exclude.xml
index a014e81e..a3cf3899 100644
--- a/src/spotbugs-exclude.xml
+++ b/src/spotbugs-exclude.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
+    Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

From d132b6b7e1646b7efd9d469114b001cfba51e51c Mon Sep 17 00:00:00 2001
From: Sebastian J <zeeman@zeeman.de>
Date: Mon, 13 May 2019 20:03:34 -0400
Subject: [PATCH 2/5] Update dependencies

and add Formatter and license header for 2019
---
 .travis.settings.xml                          |   2 +-
 README.md                                     |   4 +-
 RELEASE.md                                    |  12 ++
 pom.xml                                       | 121 ++++++++++++------
 spring-data-dynamodb-boot/pom.xml             |   2 +-
 spring-data-dynamodb-cdi/pom.xml              |   2 +-
 spring-data-dynamodb-examples/custom/pom.xml  |   4 +-
 .../custom/Application.java                   |   2 +-
 .../custom/CustomUserRepositoryMethods.java   |   2 +-
 .../CustomUserRepositoryMethodsImpl.java      |   2 +-
 .../custom/DynamoDBConfig.java                |   2 +-
 .../custom/User.java                          |   2 +-
 .../custom/UserRepository.java                |   2 +-
 .../multirepo/pom.xml                         |   4 +-
 .../multirepo/Application.java                |   2 +-
 .../multirepo/Customer.java                   |   2 +-
 .../multirepo/CustomerRepository.java         |   2 +-
 .../multirepo/Device.java                     |   2 +-
 .../multirepo/DeviceKey.java                  |   2 +-
 .../multirepo/DeviceRepository.java           |   2 +-
 .../multirepo/DynamoDBConfig.java             |   2 +-
 spring-data-dynamodb-examples/pom.xml         |   9 +-
 spring-data-dynamodb-examples/rest/pom.xml    |   4 +-
 .../rest/Application.java                     |   2 +-
 .../rest/DynamoDBConfig.java                  |   2 +-
 .../rest/User.java                            |   2 +-
 .../rest/UserRepository.java                  |   2 +-
 spring-data-dynamodb-examples/simple/pom.xml  |   4 +-
 .../simple/Application.java                   |   2 +-
 .../simple/DynamoDBConfig.java                |   2 +-
 .../simple/PagingUserRepository.java          |   2 +-
 .../simple/User.java                          |   2 +-
 .../simple/UserRepository.java                |   2 +-
 .../simple/UserRepositoryIT.java              |   2 +-
 spring-data-dynamodb/pom.xml                  |   2 +-
 .../config/AbstractDynamoDBConfiguration.java |   2 +-
 .../data/dynamodb/config/BeanNames.java       |   2 +-
 .../DynamoDBAuditingBeanDefinitionParser.java |   2 +-
 .../config/DynamoDBAuditingRegistrar.java     |   2 +-
 .../config/EnableDynamoDBAuditing.java        |   2 +-
 .../dynamodb/core/DynamoDBOperations.java     |   2 +-
 .../data/dynamodb/core/DynamoDBTemplate.java  |   2 +-
 .../data/dynamodb/domain/UnpagedPageImpl.java |   2 +-
 .../exception/BatchDeleteException.java       |   2 +-
 .../exception/BatchWriteException.java        |   2 +-
 .../AbstractDynamoDBDateMarshaller.java       |   2 +-
 .../DefaultDynamoDBDateMarshaller.java        |   2 +-
 .../mapping/DynamoDBMappingContext.java       |   2 +-
 .../mapping/DynamoDBPersistentEntity.java     |   2 +-
 .../mapping/DynamoDBPersistentEntityImpl.java |   2 +-
 .../mapping/DynamoDBPersistentProperty.java   |   2 +-
 .../DynamoDBPersistentPropertyImpl.java       |   2 +-
 .../event/AbstractDynamoDBEventListener.java  |   2 +-
 .../mapping/event/AfterDeleteEvent.java       |   2 +-
 .../mapping/event/AfterLoadEvent.java         |   2 +-
 .../mapping/event/AfterQueryEvent.java        |   2 +-
 .../mapping/event/AfterSaveEvent.java         |   2 +-
 .../mapping/event/AfterScanEvent.java         |   2 +-
 .../mapping/event/AuditingEventListener.java  |   2 +-
 .../mapping/event/BeforeDeleteEvent.java      |   2 +-
 .../mapping/event/BeforeSaveEvent.java        |   2 +-
 .../mapping/event/DynamoDBMappingEvent.java   |   2 +-
 .../mapping/event/LoggingEventListener.java   |   2 +-
 .../ValidatingDynamoDBEventListener.java      |   2 +-
 .../Date2EpocheDynamoDBMarshaller.java        |   2 +-
 .../Date2IsoDynamoDBMarshaller.java           |   2 +-
 .../marshaller/DateDynamoDBMarshaller.java    |   2 +-
 .../Instant2EpocheDynamoDBMarshaller.java     |   2 +-
 .../Instant2IsoDynamoDBMarshaller.java        |   2 +-
 .../dynamodb/query/AbstractDynamicQuery.java  |   2 +-
 .../query/AbstractMultipleEntityQuery.java    |   2 +-
 .../data/dynamodb/query/AbstractQuery.java    |   2 +-
 .../query/AbstractSingleEntityQuery.java      |   2 +-
 .../query/CountByHashAndRangeKeyQuery.java    |   2 +-
 .../dynamodb/query/CountByHashKeyQuery.java   |   2 +-
 .../MultipleEntityQueryExpressionQuery.java   |   2 +-
 .../MultipleEntityQueryRequestQuery.java      |   2 +-
 .../MultipleEntityScanExpressionQuery.java    |   2 +-
 .../spring/data/dynamodb/query/Query.java     |   2 +-
 .../query/QueryExpressionCountQuery.java      |   2 +-
 .../query/QueryRequestCountQuery.java         |   2 +-
 .../query/ScanExpressionCountQuery.java       |   2 +-
 ...ingleEntityLoadByHashAndRangeKeyQuery.java |   2 +-
 .../query/SingleEntityLoadByHashKeyQuery.java |   2 +-
 .../data/dynamodb/query/StaticQuery.java      |   2 +-
 .../repository/DynamoDBCrudRepository.java    |   2 +-
 .../repository/DynamoDBHashAndRangeKey.java   |   2 +-
 .../DynamoDBPagingAndSortingRepository.java   |   2 +-
 .../data/dynamodb/repository/EnableScan.java  |   2 +-
 .../dynamodb/repository/EnableScanCount.java  |   2 +-
 .../data/dynamodb/repository/Query.java       |   2 +-
 .../dynamodb/repository/QueryConstants.java   |   2 +-
 .../cdi/DynamoDBRepositoryBean.java           |   2 +-
 .../cdi/DynamoDBRepositoryExtension.java      |   2 +-
 .../dynamodb/repository/cdi/package-info.java |   2 +-
 .../config/DynamoDBMapperConfigFactory.java   |   2 +-
 .../DynamoDBMapperConfigPostProcessor.java    |  15 +++
 .../config/DynamoDBMapperFactory.java         |   2 +-
 .../config/DynamoDBRepositoriesRegistrar.java |   2 +-
 .../DynamoDBRepositoryConfigExtension.java    |   2 +-
 .../DynamoDBRepositoryNameSpaceHandler.java   |   2 +-
 .../config/EnableDynamoDBRepositories.java    |   2 +-
 .../query/AbstractDynamoDBQuery.java          |   2 +-
 .../query/AbstractDynamoDBQueryCreator.java   |   2 +-
 .../query/AbstractDynamoDBQueryCriteria.java  |   2 +-
 .../query/DynamoDBCountQueryCreator.java      |   2 +-
 ...moDBEntityWithHashAndRangeKeyCriteria.java |   2 +-
 ...DynamoDBEntityWithHashKeyOnlyCriteria.java |   2 +-
 .../query/DynamoDBQueryCreator.java           |   2 +-
 .../query/DynamoDBQueryCriteria.java          |   2 +-
 .../query/DynamoDBQueryLookupStrategy.java    |   2 +-
 .../repository/query/DynamoDBQueryMethod.java |   2 +-
 .../query/PartTreeDynamoDBQuery.java          |   2 +-
 .../CompositeIdHashAndRangeKeyExtractor.java  |   2 +-
 .../support/DynamoDBEntityInformation.java    |   2 +-
 .../DynamoDBEntityMetadataSupport.java        |   2 +-
 ...shAndRangeKeyExtractingEntityMetadata.java |   2 +-
 ...dRangeKeyExtractingEntityMetadataImpl.java |   2 +-
 ...ynamoDBHashAndRangeKeyMethodExtractor.java |   2 +-
 ...oDBHashAndRangeKeyMethodExtractorImpl.java |   2 +-
 ...namoDBHashKeyExtractingEntityMetadata.java |   2 +-
 ...BIdIsHashAndRangeKeyEntityInformation.java |   2 +-
 ...sHashAndRangeKeyEntityInformationImpl.java |   2 +-
 ...amoDBIdIsHashKeyEntityInformationImpl.java |   2 +-
 .../support/DynamoDBRepositoryFactory.java    |   2 +-
 .../DynamoDBRepositoryFactoryBean.java        |   2 +-
 .../EnableScanAnnotationPermissions.java      |   2 +-
 .../support/EnableScanPermissions.java        |   2 +-
 ...dAndGetterReflectionEntityInformation.java |   2 +-
 .../support/HashAndRangeKeyExtractor.java     |   2 +-
 .../repository/support/HashKeyExtractor.java  |   2 +-
 .../support/HashKeyIsIdHashKeyExtractor.java  |   2 +-
 .../support/SimpleDynamoDBCrudRepository.java |   2 +-
 ...pleDynamoDBPagingAndSortingRepository.java |   2 +-
 .../util/DynamoDBMappingContextProcessor.java |   2 +-
 .../dynamodb/repository/util/Entity2DDL.java  |   2 +-
 .../Entity2DynamoDBTableSynchronizer.java     |   2 +-
 .../EntityInformationProxyPostProcessor.java  |   2 +-
 .../data/dynamodb/utils/ExceptionHandler.java |   2 +-
 .../data/dynamodb/utils/SortHandler.java      |   2 +-
 .../config/AuditingIntegrationTests.java      |   2 +-
 .../AuditingViaJavaConfigRepositoriesIT.java  |   2 +-
 ...amoDBAuditingBeanDefinitionParserTest.java |   2 +-
 .../DynamoDBAuditingRegistrarUnitTests.java   |   2 +-
 .../data/dynamodb/core/ConfigurationTI.java   |   2 +-
 .../data/dynamodb/core/CustomerHistoryIT.java |   2 +-
 .../dynamodb/core/DynamoDBTemplateIT.java     |   2 +-
 .../dynamodb/core/DynamoDBTemplateTest.java   |   2 +-
 .../spring/data/dynamodb/core/FeedUserIT.java |   2 +-
 .../data/dynamodb/core/SortPageableIT.java    |   2 +-
 .../dynamodb/domain/UnpagedPageImplTest.java  |   2 +-
 .../dynamodb/domain/sample/AuditableUser.java |   2 +-
 .../sample/AuditableUserRepository.java       |   2 +-
 .../domain/sample/CRUDOperationsIT.java       |   2 +-
 .../domain/sample/CustomerDocument.java       |   2 +-
 .../domain/sample/CustomerDocumentIT.java     |   2 +-
 .../domain/sample/CustomerDocumentId.java     |   2 +-
 .../sample/CustomerDocumentRepository.java    |   2 +-
 .../domain/sample/CustomerHistory.java        |   2 +-
 .../domain/sample/CustomerHistoryId.java      |   2 +-
 .../sample/CustomerHistoryRepository.java     |   2 +-
 .../domain/sample/DynamoDBYearMarshaller.java |   2 +-
 .../data/dynamodb/domain/sample/Feed.java     |   2 +-
 .../domain/sample/FeedPagingRepository.java   |   2 +-
 .../data/dynamodb/domain/sample/FeedUser.java |   2 +-
 .../domain/sample/FeedUserRepository.java     |   2 +-
 .../GlobalSecondaryIndexWithRangeKeyIT.java   |   2 +-
 .../domain/sample/HashRangeKeyIT.java         |   2 +-
 .../dynamodb/domain/sample/Installation.java  |   2 +-
 .../domain/sample/InstallationRepository.java |   2 +-
 .../data/dynamodb/domain/sample/Jdk8IT.java   |   2 +-
 .../data/dynamodb/domain/sample/Playlist.java |   2 +-
 .../dynamodb/domain/sample/PlaylistId.java    |   2 +-
 .../domain/sample/PlaylistRepository.java     |   2 +-
 .../data/dynamodb/domain/sample/User.java     |   2 +-
 .../sample/UserPaginationRepository.java      |   2 +-
 .../domain/sample/UserRepository.java         |   2 +-
 .../DefaultDynamoDBDateMarshallerTest.java    |   2 +-
 .../mapping/DynamoDBMappingContextTest.java   |   2 +-
 .../mapping/DynamoDBPersistentEntityTest.java |   2 +-
 ...ynamoDBPersistentPropertyImplUnitTest.java |   2 +-
 .../AbstractDynamoDBEventListenerTest.java    |   2 +-
 .../event/LoggingEventListenerTest.java       |   2 +-
 .../ValidatingDynamoDBEventListenerTest.java  |   2 +-
 .../Date2EpocheDynamoDBMarshallerTest.java    |   2 +-
 .../Date2IsoDynamoDBMarshallerTest.java       |   2 +-
 .../Instant2EpocheDynamoDBMarshallerTest.java |   2 +-
 .../Instant2IsoDynamoDBMarshallerTest.java    |   2 +-
 .../query/AbstractDynamicQueryTest.java       |   2 +-
 .../AbstractMultipleEntityQueryTest.java      |   2 +-
 .../query/AbstractSingleEntityQueryTest.java  |   2 +-
 .../CountByHashAndRangeKeyQueryTest.java      |   2 +-
 .../query/CountByHashKeyQueryTest.java        |   2 +-
 .../query/QueryExpressionCountQueryTest.java  |   2 +-
 .../query/QueryRequestCountQueryTest.java     |   2 +-
 .../query/ScanExpressionCountQueryTest.java   |   2 +-
 .../DynamoDBHashAndRangeKeyTest.java          |   2 +-
 .../cdi/DynamoDBRepositoryBeanTest.java       |   2 +-
 ...DynamoDBMapperConfigPostProcessorTest.java |   2 +-
 ...AbstractDynamoDBQueryCriteriaUnitTest.java |   2 +-
 .../query/AbstractDynamoDBQueryTest.java      |   2 +-
 .../query/CaseChangingMarshaller.java         |   2 +-
 ...tyWithHashAndRangeKeyCriteriaUnitTest.java |   2 +-
 ...EntityWithHashKeyOnlyCriteriaUnitTest.java |   2 +-
 .../DynamoDBQueryLookupStrategyTest.java      |   2 +-
 .../query/PartTreeDynamoDBQueryUnitTest.java  |   2 +-
 ...DynamoDBEntityMetadataSupportUnitTest.java |   2 +-
 ...ndRangeKeyMethodExtractorImplUnitTest.java |   2 +-
 ...RangeKeyEntityInformationImplUnitTest.java |   2 +-
 ...sHashKeyEntityInformationImplUnitTest.java |   2 +-
 .../DynamoDBRepositoryFactoryBeanTest.java    |   2 +-
 .../DynamoDBRepositoryFactoryTest.java        |   2 +-
 .../EnableScanAnnotationPermissionTest.java   |   2 +-
 .../SimpleDynamoDBCrudRepositoryTest.java     |   2 +-
 ...oDBPagingAndSortingRepositoryUnitTest.java |   2 +-
 .../repository/util/Entity2DDLTest.java       |   2 +-
 .../Entity2DynamoDBTableSynchronizerTest.java |   2 +-
 .../dynamodb/utils/DynamoDBLocalResource.java |   2 +-
 .../data/dynamodb/utils/DynamoDBResource.java |   2 +-
 .../dynamodb/utils/ExceptionHandlerTest.java  |   2 +-
 .../data/dynamodb/utils/SortHandlerTest.java  |   2 +-
 src/changes/changes.xml                       |   2 +-
 src/checkstyle.xml                            |   2 +-
 src/eclipse-java-google-style.xml             |  14 +-
 src/pmd.xml                                   |   2 +-
 src/site/site.xml                             |   2 +-
 src/spotbugs-exclude.xml                      |   2 +-
 227 files changed, 348 insertions(+), 277 deletions(-)

diff --git a/.travis.settings.xml b/.travis.settings.xml
index 3dbc4599..6d47fbb4 100644
--- a/.travis.settings.xml
+++ b/.travis.settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
+    Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index aabad8cb..4532d183 100644
--- a/README.md
+++ b/README.md
@@ -155,7 +155,7 @@ More sample code can be found in the [spring-data-dynamodb-examples](spring-data
 Advanced topics can be found in the [wiki](https://github.com/derjust/spring-data-dynamodb/wiki).
 
 
-## Version & Spring Framework compatibility ##
+## Version & Spring Framework compatibility
 
 The major and minor number of this library refers to the compatible Spring framework version. The build number is used as specified by SEMVER.
 
@@ -169,7 +169,7 @@ API changes will follow SEMVER and loosly the Spring Framework releases.
 | 4.4.x                           | >= 1.4.0 && < 2.0              | >= 4.3 && < 5.0                | Hopper-SR2                |
 | 4.5.x                           | >= 1.4.0 && < 2.0              | >= 4.3 && < 5.0                | Ingalls                   |
 | 5.0.x                           | >= 2.0 && < 2.1                | >= 5.0 && < 5.1                | Kay-SR1                   |
-| 5.1.x                           | >= 2.1                         | >= 5.1                         | Lovelace-SR1              |
+| 5.1.x                           | >= 2.1                         | >= 5.1                         | Lovelace-SR6              |
 `spring-data-dynamodb` depends directly on `spring-data` as also `spring-context`, `spring-data` and `spring-tx`.
 
 `compile` and `runtime` dependencies are kept to a minimum to allow easy integartion, for example into
diff --git a/RELEASE.md b/RELEASE.md
index 59bea167..24d07e28 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -12,6 +12,18 @@ mvn formatter:format
 mvn license:format
 ```
 
+## Check for updated dependency versions
+
+```
+mvn versions:display-dependency-updates
+```
+
+## Check for updated plugin versions
+
+```
+mvn versions:display-plugin-updates
+```
+
 # Release process 
 
 1. Check `pom.xml` for the proper `<version />` tag
diff --git a/pom.xml b/pom.xml
index b6507f39..21a9cf23 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
+    Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
     <packaging>pom</packaging>
     <version>5.1.1-SNAPSHOT</version>
     <name>Spring Data DynamoDB Parent</name>
-    <inceptionYear>2018</inceptionYear>
+    <inceptionYear>2013</inceptionYear>
 
     <description>The primary goal of the Spring® Data project is to make it easier to build Spring-powered applications
         that use data access technologies.
@@ -38,12 +38,12 @@
     </licenses>
 
     <properties>
-        <spring.version>5.1.2.RELEASE</spring.version>
-        <spring-data.version>2.1.2.RELEASE</spring-data.version>
-        <spring-boot.version>2.0.3.RELEASE</spring-boot.version>
+        <spring.version>5.1.6.RELEASE</spring.version>
+        <spring-data.version>2.1.8.RELEASE</spring-data.version>
+        <spring-boot.version>2.1.4.RELEASE</spring-boot.version>
 
         <hibernate-validator.version>6.0.9.Final</hibernate-validator.version>
-        <aws-java-sdk.version>1.11.515</aws-java-sdk.version>
+        <aws-java-sdk.version>1.11.551</aws-java-sdk.version>
         <junit.version>4.12</junit.version>
         <mockito.version>2.23.0</mockito.version>
         <cdi.version>1.2</cdi.version>
@@ -145,31 +145,45 @@
     <build>
         <pluginManagement>
             <plugins>
-
-
+            	<plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.4</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>enforce-java</id>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                            <configuration>
-                                <rules>
-                                    <requireJavaVersion>
-                                        <version>1.8.0</version>
-                                    </requireJavaVersion>
-                                </rules>
-                            </configuration>
-                        </execution>
-                    </executions>
+                    <version>3.0.0-M2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>3.0.0-M1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>3.0.0-M1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>3.7.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.0.2</version>
+                    <version>3.1.2</version>
                     <configuration>
                         <archive>
                             <manifest>
@@ -185,11 +199,11 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.10</version>
+                    <version>3.0.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.1</version>
+                    <version>3.8.1</version>
                     <configuration>
                         <compilerArgs>
                             <compilerArg>-Xlint:unchecked</compilerArg>
@@ -200,10 +214,10 @@
                 <plugin>
                     <groupId>net.revelc.code.formatter</groupId>
                     <artifactId>formatter-maven-plugin</artifactId>
-                    <version>2.7.2</version>
+                    <version>2.9.0</version>
                     <configuration>
                         <lineEnding>LF</lineEnding>
-                        <configFile>${project.basedir}/eclipse-formatter-config.xml</configFile>
+                        <configFile>../src/eclipse-java-google-style.xml</configFile>
                     </configuration>
                     <executions>
                         <execution>
@@ -218,7 +232,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.17</version>
+                    <version>3.0.0</version>
                     <executions>
                         <execution>
                             <id>verify-style</id>
@@ -236,7 +250,7 @@
     			<plugin>
     				<groupId>com.github.spotbugs</groupId>
     				<artifactId>spotbugs-maven-plugin</artifactId>
-    				<version>3.1.5</version>
+    				<version>3.1.11</version>
     				<configuration>
     					<effort>Max</effort>
     					<!-- Reports all bugs (other values are medium and max) -->
@@ -261,8 +275,9 @@
                           <configuration>
                               <header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
                               <properties>
-                                  <owner>${project.artifactId}</owner>
+                                  <owner>spring-data-dynamodb</owner>
                                   <email>${project.url}</email>
+                                  <project.inceptionYear>2013-2019</project.inceptionYear>
                               </properties>
                               <excludes>
                                   <exclude>**/README.md</exclude>
@@ -288,6 +303,7 @@
                       <plugin>
                           <groupId>org.apache.maven.plugins</groupId>
                           <artifactId>maven-dependency-plugin</artifactId>
+                          <version>3.1.1</version>
                           <executions>
                               <execution>
                                   <!-- Prepare SQLite for in-memory DynamoDB instance (Unit testing) -->
@@ -314,7 +330,7 @@
                       <plugin>
                           <groupId>org.apache.maven.plugins</groupId>
                           <artifactId>maven-surefire-plugin</artifactId>
-                          <version>2.20.1</version>
+                          <version>3.0.0-M3</version>
                           <configuration>
                               <systemProperties>
                                   <property>
@@ -327,7 +343,7 @@
                       <plugin>
                           <groupId>org.apache.maven.plugins</groupId>
                           <artifactId>maven-failsafe-plugin</artifactId>
-                          <version>2.19</version>
+                          <version>3.0.0-M3</version>
                           <configuration>
                               <systemPropertyVariables>
                                   <sqlite4java.library.path>${project.build.directory}/lib</sqlite4java.library.path>
@@ -348,10 +364,33 @@
 
         </pluginManagement>
         <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <executions>
+                    	<execution>
+							<id>enforce-maven</id>
+							<goals>
+								<goal>enforce</goal>
+							</goals>
+							<configuration>
+								<rules>
+									<banDuplicatePomDependencyVersions/>
+									<requireMavenVersion>
+										<version>3.3.9</version>
+									</requireMavenVersion>
+                                    <requireJavaVersion>
+                                        <version>1.8.0</version>
+                                    </requireJavaVersion>
+								</rules>
+							</configuration>
+						</execution>
+                    </executions>
+                </plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
+                <version>1.6.8</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>
@@ -362,7 +401,6 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.9</version>
                 <executions>
                     <execution>
                         <goals>
@@ -577,7 +615,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.0.0</version>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -590,7 +628,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
+                        <version>1.6</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -604,7 +642,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-site-plugin</artifactId>
-                        <version>3.7</version>
                         <configuration>
                         <!-- Deactivate as Github plugin controls the upload -->
                             <skipDeploy>true</skipDeploy>
@@ -748,7 +785,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.9</version>
+                <version>3.0.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -791,12 +828,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.3</version>
+                <version>3.0.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.9.0</version>
+                <version>3.12.0</version>
                 <configuration>
                     <linkXRef>true</linkXRef>
                     <analysisCache>false</analysisCache>
@@ -810,7 +847,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.20.1</version>
+                <version>3.0.0-M3</version>
                 <configuration>
                 </configuration>
             </plugin>
diff --git a/spring-data-dynamodb-boot/pom.xml b/spring-data-dynamodb-boot/pom.xml
index 997b280b..0e9e8753 100644
--- a/spring-data-dynamodb-boot/pom.xml
+++ b/spring-data-dynamodb-boot/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb-boot (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-boot)
+    Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-boot)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-cdi/pom.xml b/spring-data-dynamodb-cdi/pom.xml
index 13caa0dd..1edce61c 100644
--- a/spring-data-dynamodb-cdi/pom.xml
+++ b/spring-data-dynamodb-cdi/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb-cdi (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-cdi)
+    Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-cdi)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/custom/pom.xml b/spring-data-dynamodb-examples/custom/pom.xml
index 5140d5e0..00195385 100644
--- a/spring-data-dynamodb-examples/custom/pom.xml
+++ b/spring-data-dynamodb-examples/custom/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
+    Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
         <groupId>com.github.derjust</groupId>
         <artifactId>spring-data-dynamodb-examples</artifactId>
         <version>5.1.1-SNAPSHOT</version>
-        <relativePath />
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>spring-data-dynamodb-examples-custom</artifactId>
     <name>Spring Data DynamoDB Custom Example</name>
diff --git a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/Application.java b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/Application.java
index f37fd3a7..27a4b09f 100644
--- a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/Application.java
+++ b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/Application.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethods.java b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethods.java
index 02ded1fc..bf28a7d2 100644
--- a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethods.java
+++ b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethods.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethodsImpl.java b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethodsImpl.java
index af45b865..aa4b2815 100644
--- a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethodsImpl.java
+++ b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/CustomUserRepositoryMethodsImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/DynamoDBConfig.java b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/DynamoDBConfig.java
index 585f3353..25446649 100644
--- a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/DynamoDBConfig.java
+++ b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/DynamoDBConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/User.java b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/User.java
index 282a78d5..89e66bad 100644
--- a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/User.java
+++ b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/User.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/UserRepository.java b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/UserRepository.java
index ffbd8423..21af79f4 100644
--- a/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/UserRepository.java
+++ b/spring-data-dynamodb-examples/custom/src/main/java/com/github/derjust/spring_data_dynamodb_examples/custom/UserRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-custom (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-custom)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/multirepo/pom.xml b/spring-data-dynamodb-examples/multirepo/pom.xml
index e4e3abd3..69806563 100644
--- a/spring-data-dynamodb-examples/multirepo/pom.xml
+++ b/spring-data-dynamodb-examples/multirepo/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb-examples-multirepo (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
+    Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
         <groupId>com.github.derjust</groupId>
         <artifactId>spring-data-dynamodb-examples</artifactId>
         <version>5.1.1-SNAPSHOT</version>
-        <relativePath />
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>spring-data-dynamodb-examples-multirepo</artifactId>
     <name>Spring Data DynamoDB Multirepo Example</name>
diff --git a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Application.java b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Application.java
index 2dc041d1..971b40a5 100644
--- a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Application.java
+++ b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Application.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-multirepo (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Customer.java b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Customer.java
index b6c115d5..e0f9e8b4 100644
--- a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Customer.java
+++ b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Customer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-multirepo (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/CustomerRepository.java b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/CustomerRepository.java
index 009783b0..a020e87d 100644
--- a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/CustomerRepository.java
+++ b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/CustomerRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-multirepo (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Device.java b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Device.java
index 8191ae3c..096b5045 100644
--- a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Device.java
+++ b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/Device.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-multirepo (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DeviceKey.java b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DeviceKey.java
index ba982a41..c55fdf17 100644
--- a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DeviceKey.java
+++ b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DeviceKey.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-multirepo (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DeviceRepository.java b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DeviceRepository.java
index f2fe45f8..f6ec2615 100644
--- a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DeviceRepository.java
+++ b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DeviceRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-multirepo (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DynamoDBConfig.java b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DynamoDBConfig.java
index ff25bd25..28bf70f0 100644
--- a/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DynamoDBConfig.java
+++ b/spring-data-dynamodb-examples/multirepo/src/main/java/com/github/derjust/spring_data_dynamodb_examples/multirepo/DynamoDBConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-multirepo (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-multirepo)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/pom.xml b/spring-data-dynamodb-examples/pom.xml
index 3428da28..0fe0abcd 100644
--- a/spring-data-dynamodb-examples/pom.xml
+++ b/spring-data-dynamodb-examples/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb-examples (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples)
+    Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -65,6 +65,13 @@
     <build>
         <pluginManagement>
             <plugins>
+            	<plugin>
+                  <groupId>net.revelc.code.formatter</groupId>
+                    <artifactId>formatter-maven-plugin</artifactId>
+                    <configuration>
+                        <configFile>../../src/eclipse-java-google-style.xml</configFile>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
diff --git a/spring-data-dynamodb-examples/rest/pom.xml b/spring-data-dynamodb-examples/rest/pom.xml
index ffe89456..e74ea294 100644
--- a/spring-data-dynamodb-examples/rest/pom.xml
+++ b/spring-data-dynamodb-examples/rest/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb-examples-rest (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
+    Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
         <groupId>com.github.derjust</groupId>
         <artifactId>spring-data-dynamodb-examples</artifactId>
         <version>5.1.1-SNAPSHOT</version>
-        <relativePath />
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>spring-data-dynamodb-examples-rest</artifactId>
     <name>Spring Data DynamoDB REST Example</name>
diff --git a/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/Application.java b/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/Application.java
index e77afc52..f9c7be72 100644
--- a/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/Application.java
+++ b/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/Application.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-rest (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/DynamoDBConfig.java b/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/DynamoDBConfig.java
index 914bbdff..854dfacf 100644
--- a/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/DynamoDBConfig.java
+++ b/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/DynamoDBConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-rest (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/User.java b/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/User.java
index 0271c510..fe261c8d 100644
--- a/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/User.java
+++ b/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/User.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-rest (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/UserRepository.java b/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/UserRepository.java
index 890a2d81..c0ccbcea 100644
--- a/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/UserRepository.java
+++ b/spring-data-dynamodb-examples/rest/src/main/java/com/github/derjust/spring_data_dynamodb_examples/rest/UserRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-rest (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/simple/pom.xml b/spring-data-dynamodb-examples/simple/pom.xml
index 110de999..3f9da714 100644
--- a/spring-data-dynamodb-examples/simple/pom.xml
+++ b/spring-data-dynamodb-examples/simple/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb-examples-simple (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
+    Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
         <groupId>com.github.derjust</groupId>
         <artifactId>spring-data-dynamodb-examples</artifactId>
         <version>5.1.1-SNAPSHOT</version>
-        <relativePath />
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>spring-data-dynamodb-examples-simple</artifactId>
     <name>Spring Data DynamoDB Simple Example</name>
diff --git a/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/Application.java b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/Application.java
index d612ff72..9c436f07 100644
--- a/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/Application.java
+++ b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/Application.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-rest (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-rest)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/DynamoDBConfig.java b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/DynamoDBConfig.java
index ddc8b1a1..8db900a7 100644
--- a/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/DynamoDBConfig.java
+++ b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/DynamoDBConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-simple (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/PagingUserRepository.java b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/PagingUserRepository.java
index 7bd325b6..d2708e72 100644
--- a/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/PagingUserRepository.java
+++ b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/PagingUserRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-simple (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/User.java b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/User.java
index 813f2af6..70476333 100644
--- a/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/User.java
+++ b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/User.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-simple (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepository.java b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepository.java
index c7ea62d8..7c585bb0 100644
--- a/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepository.java
+++ b/spring-data-dynamodb-examples/simple/src/main/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-simple (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb-examples/simple/src/test/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepositoryIT.java b/spring-data-dynamodb-examples/simple/src/test/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepositoryIT.java
index bf6de7a8..09508a6f 100644
--- a/spring-data-dynamodb-examples/simple/src/test/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepositoryIT.java
+++ b/spring-data-dynamodb-examples/simple/src/test/java/com/github/derjust/spring_data_dynamodb_examples/simple/UserRepositoryIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb-examples-simple (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb-examples/spring-data-dynamodb-examples-simple)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/pom.xml b/spring-data-dynamodb/pom.xml
index 0f9080cb..186b32d5 100755
--- a/spring-data-dynamodb/pom.xml
+++ b/spring-data-dynamodb/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+    Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/AbstractDynamoDBConfiguration.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/AbstractDynamoDBConfiguration.java
index b6592e7d..ee458b88 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/AbstractDynamoDBConfiguration.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/AbstractDynamoDBConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/BeanNames.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/BeanNames.java
index 9363bd45..684dd08a 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/BeanNames.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/BeanNames.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParser.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParser.java
index 19081f01..96ef5e62 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParser.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrar.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrar.java
index cd61890e..bd25616d 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrar.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrar.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/EnableDynamoDBAuditing.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/EnableDynamoDBAuditing.java
index a75d3b40..4081fa54 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/EnableDynamoDBAuditing.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/config/EnableDynamoDBAuditing.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBOperations.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBOperations.java
index 628772ca..fd2f9af2 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBOperations.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBOperations.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplate.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplate.java
index 4add6573..6c889119 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplate.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplate.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImpl.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImpl.java
index 4fe202b4..9ab0d74c 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImpl.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchDeleteException.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchDeleteException.java
index 8870af38..8beee08e 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchDeleteException.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchDeleteException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchWriteException.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchWriteException.java
index 6a3a9f36..da27ca33 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchWriteException.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/exception/BatchWriteException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/AbstractDynamoDBDateMarshaller.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/AbstractDynamoDBDateMarshaller.java
index bef9df32..e0e07522 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/AbstractDynamoDBDateMarshaller.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/AbstractDynamoDBDateMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshaller.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshaller.java
index fd256445..ddc8b27d 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshaller.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContext.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContext.java
index de8dbf9c..53e29d80 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContext.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContext.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntity.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntity.java
index 126b35f8..8bb05335 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntity.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntity.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityImpl.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityImpl.java
index 27680edc..1823ec4e 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityImpl.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentProperty.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentProperty.java
index a259470f..dd495adb 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentProperty.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentProperty.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImpl.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImpl.java
index 0e5774e0..224a5bf5 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImpl.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListener.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListener.java
index 04fc9d19..8699ce97 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListener.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterDeleteEvent.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterDeleteEvent.java
index 4f6a5c5a..d4a3eab9 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterDeleteEvent.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterDeleteEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterLoadEvent.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterLoadEvent.java
index e0bf58af..e6bd286e 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterLoadEvent.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterLoadEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterQueryEvent.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterQueryEvent.java
index f0ced938..47cf447d 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterQueryEvent.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterQueryEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterSaveEvent.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterSaveEvent.java
index b41b0a2b..f6943e95 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterSaveEvent.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterSaveEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterScanEvent.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterScanEvent.java
index a525a7aa..3cc1f206 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterScanEvent.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterScanEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AuditingEventListener.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AuditingEventListener.java
index 3bd1ab14..a0c3c380 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AuditingEventListener.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AuditingEventListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeDeleteEvent.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeDeleteEvent.java
index 5d71858f..4ea73820 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeDeleteEvent.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeDeleteEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeSaveEvent.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeSaveEvent.java
index ed280fa6..30c3d6c2 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeSaveEvent.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/BeforeSaveEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/DynamoDBMappingEvent.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/DynamoDBMappingEvent.java
index 4b62fef3..672b1315 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/DynamoDBMappingEvent.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/DynamoDBMappingEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListener.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListener.java
index 4a741409..43597d81 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListener.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListener.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListener.java
index ce3bc237..5d5e4174 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListener.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshaller.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshaller.java
index 2507bb34..a1fd8b07 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshaller.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshaller.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshaller.java
index c958efe6..94327ab7 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshaller.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/DateDynamoDBMarshaller.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/DateDynamoDBMarshaller.java
index a4a1d158..bece984e 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/DateDynamoDBMarshaller.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/DateDynamoDBMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshaller.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshaller.java
index 2674c9f8..a67e55ab 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshaller.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshaller.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshaller.java
index ca1e45e4..373c0837 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshaller.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQuery.java
index c9d1b94c..3d8e9eaf 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQuery.java
index 1703abc2..ad9cbc69 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractQuery.java
index 87d3e0a3..83d5b7c0 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQuery.java
index 1dbef82d..407d2982 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQuery.java
index 7da2e849..c123b98b 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQuery.java
index d6c194c0..a80affc3 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryExpressionQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryExpressionQuery.java
index facf14be..bb059aad 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryExpressionQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryExpressionQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryRequestQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryRequestQuery.java
index 179b43b3..5122efe3 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryRequestQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityQueryRequestQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityScanExpressionQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityScanExpressionQuery.java
index 10935424..964ee7e1 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityScanExpressionQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/MultipleEntityScanExpressionQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/Query.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/Query.java
index 9356512a..4ab41bc8 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/Query.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/Query.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQuery.java
index a4b71749..affa507d 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQuery.java
index b020ad9b..7830fd02 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQuery.java
index 5c87c6a7..e2f493ae 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashAndRangeKeyQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashAndRangeKeyQuery.java
index 9693396b..d530b454 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashAndRangeKeyQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashAndRangeKeyQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashKeyQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashKeyQuery.java
index 27b745ba..7cc2ac1e 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashKeyQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/SingleEntityLoadByHashKeyQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/StaticQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/StaticQuery.java
index ce502978..b4be4c92 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/StaticQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/query/StaticQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBCrudRepository.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBCrudRepository.java
index 8ef0d7a1..2d0364a3 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBCrudRepository.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBCrudRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKey.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKey.java
index bac1eaed..18c65a38 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKey.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKey.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBPagingAndSortingRepository.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBPagingAndSortingRepository.java
index 03e99c37..b9d36a56 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBPagingAndSortingRepository.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBPagingAndSortingRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScan.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScan.java
index 60c00fad..bb1c7ecf 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScan.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScan.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScanCount.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScanCount.java
index 7278be40..98ca5875 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScanCount.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/EnableScanCount.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java
index 3121b3db..c0eea5b7 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/Query.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/QueryConstants.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/QueryConstants.java
index b8317a71..6d3d4b90 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/QueryConstants.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/QueryConstants.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBean.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBean.java
index 4deb8ece..d2ce66ed 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBean.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBean.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryExtension.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryExtension.java
index da112288..2e3495fc 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryExtension.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryExtension.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/package-info.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/package-info.java
index d2a1f3b1..02351100 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/package-info.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/cdi/package-info.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactory.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactory.java
index e85e62dd..32e2246a 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactory.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigPostProcessor.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigPostProcessor.java
index 33de35df..68519027 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigPostProcessor.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigPostProcessor.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ *
+ * 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 org.socialsignin.spring.data.dynamodb.repository.config;
 
 import org.slf4j.Logger;
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperFactory.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperFactory.java
index 0562b644..537e4dbb 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperFactory.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoriesRegistrar.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoriesRegistrar.java
index 63ee4b94..8439052b 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoriesRegistrar.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoriesRegistrar.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java
index f7f8df6f..d53d37f1 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryConfigExtension.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryNameSpaceHandler.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryNameSpaceHandler.java
index 51b7241c..4e3e4b69 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryNameSpaceHandler.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBRepositoryNameSpaceHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/EnableDynamoDBRepositories.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/EnableDynamoDBRepositories.java
index f07af56d..118dcffc 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/EnableDynamoDBRepositories.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/config/EnableDynamoDBRepositories.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQuery.java
index 12a2f688..91d64e4a 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCreator.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCreator.java
index e1d66042..47da1b8a 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCreator.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCreator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteria.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteria.java
index d8c58b5b..3f328a87 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteria.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteria.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBCountQueryCreator.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBCountQueryCreator.java
index 6581b3b3..5339a263 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBCountQueryCreator.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBCountQueryCreator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteria.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteria.java
index 4d72eb6b..9f8b6e81 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteria.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteria.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteria.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteria.java
index 736edcc4..bf737cf2 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteria.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteria.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCreator.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCreator.java
index 9792d36f..21d08ba6 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCreator.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCreator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCriteria.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCriteria.java
index 24010e23..d667f3a0 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCriteria.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryCriteria.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategy.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategy.java
index a2c9d049..bcfe12bf 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategy.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategy.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryMethod.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryMethod.java
index c7df8e15..da3e18a1 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryMethod.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryMethod.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQuery.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQuery.java
index 0bb9a3c2..7a05be3a 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQuery.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQuery.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/CompositeIdHashAndRangeKeyExtractor.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/CompositeIdHashAndRangeKeyExtractor.java
index 62000d9f..90379579 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/CompositeIdHashAndRangeKeyExtractor.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/CompositeIdHashAndRangeKeyExtractor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityInformation.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityInformation.java
index 4e336085..3bf0bebb 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityInformation.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityInformation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupport.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupport.java
index cad5fe51..bd995657 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupport.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupport.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadata.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadata.java
index 2c58df76..12cca30f 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadata.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadata.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadataImpl.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadataImpl.java
index df636a05..ab704944 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadataImpl.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyExtractingEntityMetadataImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractor.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractor.java
index b1605e09..a0a935d4 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractor.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImpl.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImpl.java
index bbeae105..dca0468a 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImpl.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashKeyExtractingEntityMetadata.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashKeyExtractingEntityMetadata.java
index 1e2145cd..ef38ff55 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashKeyExtractingEntityMetadata.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashKeyExtractingEntityMetadata.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformation.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformation.java
index d7f6674d..2fd69b89 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformation.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImpl.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImpl.java
index e1128059..a3559b92 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImpl.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImpl.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImpl.java
index 7b652562..3e211ae1 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImpl.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImpl.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactory.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactory.java
index 8b4a94e0..35b9cc36 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactory.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBean.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBean.java
index cfac2a56..308e1f8e 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBean.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBean.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissions.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissions.java
index 845fc6a9..9bcc89eb 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissions.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissions.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanPermissions.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanPermissions.java
index 6a1ac4f2..7da26279 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanPermissions.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanPermissions.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/FieldAndGetterReflectionEntityInformation.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/FieldAndGetterReflectionEntityInformation.java
index 0e9692e6..f4d2412b 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/FieldAndGetterReflectionEntityInformation.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/FieldAndGetterReflectionEntityInformation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashAndRangeKeyExtractor.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashAndRangeKeyExtractor.java
index e28bd14c..b621b477 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashAndRangeKeyExtractor.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashAndRangeKeyExtractor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyExtractor.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyExtractor.java
index ee67077f..afb5d7c5 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyExtractor.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyExtractor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyIsIdHashKeyExtractor.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyIsIdHashKeyExtractor.java
index 54b8e2d9..ffc93795 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyIsIdHashKeyExtractor.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/HashKeyIsIdHashKeyExtractor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepository.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepository.java
index 59d4d696..df777a99 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepository.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepository.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepository.java
index 91cbf47f..06a7312e 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepository.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/DynamoDBMappingContextProcessor.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/DynamoDBMappingContextProcessor.java
index ec1aa288..9e6091b6 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/DynamoDBMappingContextProcessor.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/DynamoDBMappingContextProcessor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDL.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDL.java
index 59d743eb..d709140a 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDL.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDL.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizer.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizer.java
index 5e1ec743..cc8e0df6 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizer.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/EntityInformationProxyPostProcessor.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/EntityInformationProxyPostProcessor.java
index 9f3e01fe..c3df9451 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/EntityInformationProxyPostProcessor.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/repository/util/EntityInformationProxyPostProcessor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandler.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandler.java
index 5ed69e44..082ef268 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandler.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/utils/SortHandler.java b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/utils/SortHandler.java
index 16923631..4a939a72 100644
--- a/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/utils/SortHandler.java
+++ b/spring-data-dynamodb/src/main/java/org/socialsignin/spring/data/dynamodb/utils/SortHandler.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingIntegrationTests.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingIntegrationTests.java
index 95a03301..63ec424c 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingIntegrationTests.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingIntegrationTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingViaJavaConfigRepositoriesIT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingViaJavaConfigRepositoriesIT.java
index b4b6c633..09b60a4f 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingViaJavaConfigRepositoriesIT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/AuditingViaJavaConfigRepositoriesIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParserTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParserTest.java
index 0b2d1fa0..975db555 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParserTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingBeanDefinitionParserTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrarUnitTests.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrarUnitTests.java
index c384b0f8..d38e81ba 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrarUnitTests.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/config/DynamoDBAuditingRegistrarUnitTests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/ConfigurationTI.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/ConfigurationTI.java
index 49224a0c..84264691 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/ConfigurationTI.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/ConfigurationTI.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/CustomerHistoryIT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/CustomerHistoryIT.java
index ef0ead52..40026f4b 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/CustomerHistoryIT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/CustomerHistoryIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateIT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateIT.java
index 409430c5..012304d4 100755
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateIT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateTest.java
index 054d94ed..995a9f37 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/DynamoDBTemplateTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/FeedUserIT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/FeedUserIT.java
index 64220304..bec4ed1e 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/FeedUserIT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/FeedUserIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/SortPageableIT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/SortPageableIT.java
index 76ca2332..7bbfd02d 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/SortPageableIT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/core/SortPageableIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImplTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImplTest.java
index ffe28846..4ced63dc 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImplTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/UnpagedPageImplTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUser.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUser.java
index bf74f3bf..664ccb84 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUser.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUser.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUserRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUserRepository.java
index 08d348e2..d64611cd 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUserRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/AuditableUserRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CRUDOperationsIT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CRUDOperationsIT.java
index fa002b15..9f41c61e 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CRUDOperationsIT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CRUDOperationsIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocument.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocument.java
index 2f0dfd80..e6be5ad3 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocument.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocument.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentIT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentIT.java
index f32c602b..f7a8a7ef 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentIT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentId.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentId.java
index e0830eb0..617f3564 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentId.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentId.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentRepository.java
index beb716a2..969bc46a 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerDocumentRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistory.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistory.java
index 7b708cf2..afd9a7dc 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistory.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryId.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryId.java
index 3b9e275b..f63461c6 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryId.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryId.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryRepository.java
index 2ccb331a..b521c287 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/CustomerHistoryRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/DynamoDBYearMarshaller.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/DynamoDBYearMarshaller.java
index d4d59eb8..4124d115 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/DynamoDBYearMarshaller.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/DynamoDBYearMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Feed.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Feed.java
index 2b961125..21313d60 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Feed.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Feed.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedPagingRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedPagingRepository.java
index 12fcdc14..102b6e3a 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedPagingRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedPagingRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUser.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUser.java
index 36337354..694046a4 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUser.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUser.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUserRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUserRepository.java
index b91776e7..1d7a2b69 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUserRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/FeedUserRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/GlobalSecondaryIndexWithRangeKeyIT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/GlobalSecondaryIndexWithRangeKeyIT.java
index 9a59f286..f2e9eff4 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/GlobalSecondaryIndexWithRangeKeyIT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/GlobalSecondaryIndexWithRangeKeyIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/HashRangeKeyIT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/HashRangeKeyIT.java
index 63c5ae8f..504ca58c 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/HashRangeKeyIT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/HashRangeKeyIT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Installation.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Installation.java
index 4f5a51b0..6fcce788 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Installation.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Installation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/InstallationRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/InstallationRepository.java
index 9d029d70..10efd7bd 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/InstallationRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/InstallationRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Jdk8IT.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Jdk8IT.java
index fff46e33..11cb675b 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Jdk8IT.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Jdk8IT.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Playlist.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Playlist.java
index 8a4052db..5f51925f 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Playlist.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Playlist.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistId.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistId.java
index eeb5433f..c403900f 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistId.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistId.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistRepository.java
index 5942f618..846c98f7 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/User.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/User.java
index 93335666..7600097e 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/User.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/User.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserPaginationRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserPaginationRepository.java
index 7825dfb1..071944d3 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserPaginationRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserPaginationRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java
index e4e5c43e..bcf65d6e 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/UserRepository.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshallerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshallerTest.java
index 7b2ac81e..bb8e16eb 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshallerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshallerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContextTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContextTest.java
index 470f44f8..aea60694 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContextTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContextTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityTest.java
index 2a00bdbe..f3179170 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImplUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImplUnitTest.java
index 1154d67b..49e05bff 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImplUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImplUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListenerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListenerTest.java
index a5464015..754b1fa0 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListenerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListenerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListenerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListenerTest.java
index beee0786..77e12246 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListenerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/LoggingEventListenerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListenerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListenerTest.java
index ca42e386..16782c9a 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListenerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/mapping/event/ValidatingDynamoDBEventListenerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshallerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshallerTest.java
index 38d8765b..d42b9065 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshallerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshallerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshallerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshallerTest.java
index f5bcfe11..07960e39 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshallerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshallerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshallerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshallerTest.java
index 30acdbd6..140e1b7f 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshallerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshallerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshallerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshallerTest.java
index f4e16cec..06ed9e8c 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshallerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshallerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQueryTest.java
index 77e5fe04..6013df34 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractDynamicQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQueryTest.java
index fe790e9f..651bbdea 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractMultipleEntityQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQueryTest.java
index 67a24388..46cfadd6 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/AbstractSingleEntityQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQueryTest.java
index 1a2f2a3a..cfa66669 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashAndRangeKeyQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQueryTest.java
index 34db311e..2b73df72 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/CountByHashKeyQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQueryTest.java
index e2efe2d8..380bcae9 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryExpressionCountQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQueryTest.java
index 9bef8f4b..47d3120c 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/QueryRequestCountQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQueryTest.java
index 1756f203..6a11840a 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/query/ScanExpressionCountQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKeyTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKeyTest.java
index ab948392..e481e51b 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKeyTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/DynamoDBHashAndRangeKeyTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBeanTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBeanTest.java
index 9baa3181..d44d1990 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBeanTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/cdi/DynamoDBRepositoryBeanTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigPostProcessorTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigPostProcessorTest.java
index 30acc496..9ec905fe 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigPostProcessorTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/config/DynamoDBMapperConfigPostProcessorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteriaUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteriaUnitTest.java
index 9754ca06..0cee13ae 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteriaUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryCriteriaUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryTest.java
index 803cd034..b05617b0 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/CaseChangingMarshaller.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/CaseChangingMarshaller.java
index 216279e8..ad8d05fa 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/CaseChangingMarshaller.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/CaseChangingMarshaller.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteriaUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteriaUnitTest.java
index 6bb32645..3d362c10 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteriaUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashAndRangeKeyCriteriaUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteriaUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteriaUnitTest.java
index 96b5683e..3301520b 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteriaUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBEntityWithHashKeyOnlyCriteriaUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategyTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategyTest.java
index c447c289..68ecb976 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategyTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/DynamoDBQueryLookupStrategyTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQueryUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQueryUnitTest.java
index b2bb4b6c..89074ae5 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQueryUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQueryUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupportUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupportUnitTest.java
index e425bbbb..9c387c36 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupportUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupportUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImplUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImplUnitTest.java
index b26c07f8..831c105d 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImplUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBHashAndRangeKeyMethodExtractorImplUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImplUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImplUnitTest.java
index dfb05e58..9b1bf593 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImplUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashAndRangeKeyEntityInformationImplUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImplUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImplUnitTest.java
index 859db268..6277ace6 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImplUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBIdIsHashKeyEntityInformationImplUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBeanTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBeanTest.java
index 2c3a1e9b..878bba4d 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBeanTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryBeanTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryTest.java
index a0bf2aca..e9376ec4 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBRepositoryFactoryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissionTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissionTest.java
index 11719768..463da1d3 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissionTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/EnableScanAnnotationPermissionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepositoryTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepositoryTest.java
index 259a9087..3b502637 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepositoryTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBCrudRepositoryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepositoryUnitTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepositoryUnitTest.java
index 28fd500e..ada853cd 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepositoryUnitTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/support/SimpleDynamoDBPagingAndSortingRepositoryUnitTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDLTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDLTest.java
index 78f2cc35..45655a2e 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDLTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DDLTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizerTest.java
index 63136999..11a55baa 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/repository/util/Entity2DynamoDBTableSynchronizerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBLocalResource.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBLocalResource.java
index 25c890f6..93f698ec 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBLocalResource.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBLocalResource.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBResource.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBResource.java
index 51ff75cc..ca3a8b65 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBResource.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/DynamoDBResource.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandlerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandlerTest.java
index bf646474..4a373b73 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandlerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/ExceptionHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/SortHandlerTest.java b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/SortHandlerTest.java
index 1ddc32f4..955f1d28 100644
--- a/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/SortHandlerTest.java
+++ b/spring-data-dynamodb/src/test/java/org/socialsignin/spring/data/dynamodb/utils/SortHandlerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
+ * Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb/spring-data-dynamodb)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c39615b9..e437d581 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
+    Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/src/checkstyle.xml b/src/checkstyle.xml
index 92f70ca5..1747b30e 100644
--- a/src/checkstyle.xml
+++ b/src/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
+    Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/src/eclipse-java-google-style.xml b/src/eclipse-java-google-style.xml
index 56e50792..a8b1a7d3 100644
--- a/src/eclipse-java-google-style.xml
+++ b/src/eclipse-java-google-style.xml
@@ -48,7 +48,7 @@
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression.count_dependent" value="16|4|80"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration.count_dependent" value="16|4|48"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="4"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration.count_dependent" value="16|4|49"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
@@ -58,7 +58,7 @@
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments" value="16"/>
-        <setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
+        <setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration.count_dependent" value="16|4|48"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
@@ -167,7 +167,7 @@
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
@@ -201,8 +201,8 @@
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation.count_dependent" value="16|-1|16"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="1585"/>
-        <setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
-        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+        <setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="4"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
@@ -239,7 +239,7 @@
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant.count_dependent" value="16|-1|16"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
@@ -284,7 +284,7 @@
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
+        <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
         <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
diff --git a/src/pmd.xml b/src/pmd.xml
index c92e09f7..9c207ad9 100644
--- a/src/pmd.xml
+++ b/src/pmd.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
+    Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/src/site/site.xml b/src/site/site.xml
index e5c13adc..28fdd9bf 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
+    Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/src/spotbugs-exclude.xml b/src/spotbugs-exclude.xml
index a3cf3899..a686b9e2 100644
--- a/src/spotbugs-exclude.xml
+++ b/src/spotbugs-exclude.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2018 spring-data-dynamodb-parent (https://github.com/derjust/spring-data-dynamodb)
+    Copyright © 2013-2019 spring-data-dynamodb (https://github.com/derjust/spring-data-dynamodb)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

From 489d95863d90d66c9b4552839b102595cecd088b Mon Sep 17 00:00:00 2001
From: Sebastian J <zeeman@zeeman.de>
Date: Fri, 21 Jun 2019 23:51:42 -0400
Subject: [PATCH 3/5] Active OpenJDK 10, 11 and 12 for TravisCI

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a0ec6b8c..fb794082 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,9 @@ language:
 jdk:
   - oraclejdk8
   - oraclejdk9
+  - openjdk10
+  - openjdk11
+  - openjdk12
 
 env:
   - TRAVIS_CI=true

From f0ecce97e3b83956705f8b9f0b8778b172169ea4 Mon Sep 17 00:00:00 2001
From: Sebastian J <zeeman@zeeman.de>
Date: Fri, 21 Jun 2019 23:59:18 -0400
Subject: [PATCH 4/5] Adding signatures

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 21a9cf23..6e83c66d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
     limitations under the License.
 
 -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.derjust</groupId>

From f783a935b7509e63abe182612d6f048d29727d7c Mon Sep 17 00:00:00 2001
From: Sebastian J <zeeman@zeeman.de>
Date: Sat, 22 Jun 2019 00:16:41 -0400
Subject: [PATCH 5/5] Fix CI profile activation

---
 pom.xml                                    | 3 +--
 spring-data-dynamodb-examples/rest/pom.xml | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e83c66d..e2bd6558 100755
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,6 @@
     limitations under the License.
 
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.derjust</groupId>
@@ -592,7 +591,7 @@
             <id>ci</id>
             <activation>
                 <property>
-                    <name>!TRAVIS_CI</name>
+                    <name>env.TRAVIS_CI</name>
                 </property>
             </activation>
         </profile>
diff --git a/spring-data-dynamodb-examples/rest/pom.xml b/spring-data-dynamodb-examples/rest/pom.xml
index e74ea294..dcb5910e 100644
--- a/spring-data-dynamodb-examples/rest/pom.xml
+++ b/spring-data-dynamodb-examples/rest/pom.xml
@@ -64,6 +64,12 @@
                 <configuration>
                     <mainClass>com.github.derjust.spring_data_dynamodb_examples.rest.Application</mainClass>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>exec</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>