diff --git a/openid-connect-server/src/main/java/org/mitre/jdbc/datasource/H2DataSourceFactory.java b/openid-connect-common/src/main/java/org/mitre/jdbc/datasource/H2DataSourceFactory.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/jdbc/datasource/H2DataSourceFactory.java
rename to openid-connect-common/src/main/java/org/mitre/jdbc/datasource/H2DataSourceFactory.java
diff --git a/openid-connect-server/src/main/java/org/mitre/jdbc/datasource/util/SqlFileParser.java b/openid-connect-common/src/main/java/org/mitre/jdbc/datasource/util/SqlFileParser.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/jdbc/datasource/util/SqlFileParser.java
rename to openid-connect-common/src/main/java/org/mitre/jdbc/datasource/util/SqlFileParser.java
diff --git a/openid-connect-server/src/main/java/org/mitre/jwt/signer/AbstractJwtSigner.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/AbstractJwtSigner.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/jwt/signer/AbstractJwtSigner.java
rename to openid-connect-common/src/main/java/org/mitre/jwt/signer/AbstractJwtSigner.java
diff --git a/openid-connect-server/src/main/java/org/mitre/jwt/signer/JwsAlgorithm.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/JwsAlgorithm.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/jwt/signer/JwsAlgorithm.java
rename to openid-connect-common/src/main/java/org/mitre/jwt/signer/JwsAlgorithm.java
diff --git a/openid-connect-server/src/main/java/org/mitre/jwt/signer/JwtSigner.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/JwtSigner.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/jwt/signer/JwtSigner.java
rename to openid-connect-common/src/main/java/org/mitre/jwt/signer/JwtSigner.java
diff --git a/openid-connect-server/src/main/java/org/mitre/jwt/signer/impl/HmacSigner.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/impl/HmacSigner.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/jwt/signer/impl/HmacSigner.java
rename to openid-connect-common/src/main/java/org/mitre/jwt/signer/impl/HmacSigner.java
diff --git a/openid-connect-server/src/main/java/org/mitre/jwt/signer/impl/PlaintextSigner.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/impl/PlaintextSigner.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/jwt/signer/impl/PlaintextSigner.java
rename to openid-connect-common/src/main/java/org/mitre/jwt/signer/impl/PlaintextSigner.java
diff --git a/openid-connect-server/src/main/java/org/mitre/jwt/signer/impl/RsaSigner.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/impl/RsaSigner.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/jwt/signer/impl/RsaSigner.java
rename to openid-connect-common/src/main/java/org/mitre/jwt/signer/impl/RsaSigner.java
diff --git a/openid-connect-server/src/main/java/org/mitre/jwt/signer/service/JwtSigningAndValidationService.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/JwtSigningAndValidationService.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/jwt/signer/service/JwtSigningAndValidationService.java
rename to openid-connect-common/src/main/java/org/mitre/jwt/signer/service/JwtSigningAndValidationService.java
diff --git a/openid-connect-server/src/main/java/org/mitre/jwt/signer/service/impl/JwtSigningAndValidationServiceDefault.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JwtSigningAndValidationServiceDefault.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/jwt/signer/service/impl/JwtSigningAndValidationServiceDefault.java
rename to openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JwtSigningAndValidationServiceDefault.java
diff --git a/openid-connect-server/src/main/java/org/mitre/jwt/signer/service/impl/KeyStore.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/KeyStore.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/jwt/signer/service/impl/KeyStore.java
rename to openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/KeyStore.java
diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/OAuth2ClientRepository.java b/openid-connect-common/src/main/java/org/mitre/oauth2/repository/OAuth2ClientRepository.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/oauth2/repository/OAuth2ClientRepository.java
rename to openid-connect-common/src/main/java/org/mitre/oauth2/repository/OAuth2ClientRepository.java
diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/OAuth2TokenRepository.java b/openid-connect-common/src/main/java/org/mitre/oauth2/repository/OAuth2TokenRepository.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/oauth2/repository/OAuth2TokenRepository.java
rename to openid-connect-common/src/main/java/org/mitre/oauth2/repository/OAuth2TokenRepository.java
diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/service/ClientDetailsEntityService.java b/openid-connect-common/src/main/java/org/mitre/oauth2/service/ClientDetailsEntityService.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/oauth2/service/ClientDetailsEntityService.java
rename to openid-connect-common/src/main/java/org/mitre/oauth2/service/ClientDetailsEntityService.java
diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/service/OAuth2TokenEntityService.java b/openid-connect-common/src/main/java/org/mitre/oauth2/service/OAuth2TokenEntityService.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/oauth2/service/OAuth2TokenEntityService.java
rename to openid-connect-common/src/main/java/org/mitre/oauth2/service/OAuth2TokenEntityService.java
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/config/ConfigurationPropertiesBean.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/config/ConfigurationPropertiesBean.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/config/ConfigurationPropertiesBean.java
rename to openid-connect-common/src/main/java/org/mitre/openid/connect/config/ConfigurationPropertiesBean.java
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/AddressRepository.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/AddressRepository.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/repository/AddressRepository.java
rename to openid-connect-common/src/main/java/org/mitre/openid/connect/repository/AddressRepository.java
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java
rename to openid-connect-common/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/EventRepository.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/EventRepository.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/repository/EventRepository.java
rename to openid-connect-common/src/main/java/org/mitre/openid/connect/repository/EventRepository.java
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/IdTokenClaimsRepository.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/IdTokenClaimsRepository.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/repository/IdTokenClaimsRepository.java
rename to openid-connect-common/src/main/java/org/mitre/openid/connect/repository/IdTokenClaimsRepository.java
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java
rename to openid-connect-common/src/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java
rename to openid-connect-common/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java
rename to openid-connect-common/src/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/AddressService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/AddressService.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/service/AddressService.java
rename to openid-connect-common/src/main/java/org/mitre/openid/connect/service/AddressService.java
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/ApprovedSiteService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/ApprovedSiteService.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/service/ApprovedSiteService.java
rename to openid-connect-common/src/main/java/org/mitre/openid/connect/service/ApprovedSiteService.java
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/ClientUserDetailsService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/ClientUserDetailsService.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/service/ClientUserDetailsService.java
rename to openid-connect-common/src/main/java/org/mitre/openid/connect/service/ClientUserDetailsService.java
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/EventService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/EventService.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/service/EventService.java
rename to openid-connect-common/src/main/java/org/mitre/openid/connect/service/EventService.java
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/IdTokenClaimsService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/IdTokenClaimsService.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/service/IdTokenClaimsService.java
rename to openid-connect-common/src/main/java/org/mitre/openid/connect/service/IdTokenClaimsService.java
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/IdTokenService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/IdTokenService.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/service/IdTokenService.java
rename to openid-connect-common/src/main/java/org/mitre/openid/connect/service/IdTokenService.java
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/UserInfoService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/UserInfoService.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/service/UserInfoService.java
rename to openid-connect-common/src/main/java/org/mitre/openid/connect/service/UserInfoService.java
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/WhitelistedSiteService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/WhitelistedSiteService.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/openid/connect/service/WhitelistedSiteService.java
rename to openid-connect-common/src/main/java/org/mitre/openid/connect/service/WhitelistedSiteService.java
diff --git a/openid-connect-server/src/main/java/org/mitre/util/Utility.java b/openid-connect-common/src/main/java/org/mitre/util/Utility.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/util/Utility.java
rename to openid-connect-common/src/main/java/org/mitre/util/Utility.java
diff --git a/openid-connect-server/src/main/java/org/mitre/util/jpa/JpaUtil.java b/openid-connect-common/src/main/java/org/mitre/util/jpa/JpaUtil.java
similarity index 100%
rename from openid-connect-server/src/main/java/org/mitre/util/jpa/JpaUtil.java
rename to openid-connect-common/src/main/java/org/mitre/util/jpa/JpaUtil.java