diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml
index 662fe9a6..41a34f27 100644
--- a/spring-cloud-netflix-eureka-server/pom.xml
+++ b/spring-cloud-netflix-eureka-server/pom.xml
@@ -73,6 +73,12 @@
 			<artifactId>bootstrap</artifactId>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<!-- Only needed at compile time -->
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java
index b51459d9..c785114f 100644
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java
+++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java
@@ -32,11 +32,11 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.netflix.eureka.DiscoveryManagerIntitializer;
 import org.springframework.cloud.netflix.eureka.EurekaServerConfigBean;
-import org.springframework.cloud.netflix.eureka.advice.LeaseManagerLite;
-import org.springframework.cloud.netflix.eureka.advice.PiggybackMethodInterceptor;
-import org.springframework.cloud.netflix.eureka.event.EurekaRegistryAvailableEvent;
-import org.springframework.cloud.netflix.eureka.event.EurekaServerStartedEvent;
-import org.springframework.cloud.netflix.eureka.event.LeaseManagerMessageBroker;
+import org.springframework.cloud.netflix.eureka.server.advice.LeaseManagerLite;
+import org.springframework.cloud.netflix.eureka.server.advice.PiggybackMethodInterceptor;
+import org.springframework.cloud.netflix.eureka.server.event.EurekaRegistryAvailableEvent;
+import org.springframework.cloud.netflix.eureka.server.event.EurekaServerStartedEvent;
+import org.springframework.cloud.netflix.eureka.server.event.LeaseManagerMessageBroker;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.SmartLifecycle;
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/advice/LeaseManagerLite.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/advice/LeaseManagerLite.java
similarity index 93%
rename from spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/advice/LeaseManagerLite.java
rename to spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/advice/LeaseManagerLite.java
index fd1a09bd..e17356e4 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/advice/LeaseManagerLite.java
+++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/advice/LeaseManagerLite.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.netflix.eureka.advice;
+package org.springframework.cloud.netflix.eureka.server.advice;
 
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.eureka.lease.LeaseManager;
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/advice/PiggybackMethodInterceptor.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/advice/PiggybackMethodInterceptor.java
similarity index 96%
rename from spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/advice/PiggybackMethodInterceptor.java
rename to spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/advice/PiggybackMethodInterceptor.java
index 67a33497..46064a67 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/advice/PiggybackMethodInterceptor.java
+++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/advice/PiggybackMethodInterceptor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.netflix.eureka.advice;
+package org.springframework.cloud.netflix.eureka.server.advice;
 
 import java.lang.reflect.Method;
 
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceCanceledEvent.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceCanceledEvent.java
similarity index 90%
rename from spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceCanceledEvent.java
rename to spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceCanceledEvent.java
index 254f30b9..e3661a77 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceCanceledEvent.java
+++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceCanceledEvent.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.netflix.eureka.event;
+package org.springframework.cloud.netflix.eureka.server.event;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceRegisteredEvent.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRegisteredEvent.java
similarity index 91%
rename from spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceRegisteredEvent.java
rename to spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRegisteredEvent.java
index 61affd75..455d34e5 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceRegisteredEvent.java
+++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRegisteredEvent.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.netflix.eureka.event;
+package org.springframework.cloud.netflix.eureka.server.event;
 
 import com.netflix.appinfo.InstanceInfo;
 
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceRenewedEvent.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRenewedEvent.java
similarity index 92%
rename from spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceRenewedEvent.java
rename to spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRenewedEvent.java
index e7dae21b..1573314f 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceRenewedEvent.java
+++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRenewedEvent.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.netflix.eureka.event;
+package org.springframework.cloud.netflix.eureka.server.event;
 
 import com.netflix.appinfo.InstanceInfo;
 
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaRegistryAvailableEvent.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaRegistryAvailableEvent.java
similarity index 94%
rename from spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaRegistryAvailableEvent.java
rename to spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaRegistryAvailableEvent.java
index a41599ea..9b174ef4 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaRegistryAvailableEvent.java
+++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaRegistryAvailableEvent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.netflix.eureka.event;
+package org.springframework.cloud.netflix.eureka.server.event;
 
 import org.springframework.context.ApplicationEvent;
 
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaServerStartedEvent.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaServerStartedEvent.java
similarity index 94%
rename from spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaServerStartedEvent.java
rename to spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaServerStartedEvent.java
index 0cec6c4f..edd8feea 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaServerStartedEvent.java
+++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaServerStartedEvent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.netflix.eureka.event;
+package org.springframework.cloud.netflix.eureka.server.event;
 
 import org.springframework.context.ApplicationEvent;
 
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/LeaseManagerMessageBroker.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/LeaseManagerMessageBroker.java
similarity index 95%
rename from spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/LeaseManagerMessageBroker.java
rename to spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/LeaseManagerMessageBroker.java
index c1017de0..20d80bb8 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/LeaseManagerMessageBroker.java
+++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/LeaseManagerMessageBroker.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.netflix.eureka.event;
+package org.springframework.cloud.netflix.eureka.server.event;
 
 import static com.google.common.collect.Iterables.tryFind;
 
@@ -9,7 +9,7 @@ import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.netflix.eureka.advice.LeaseManagerLite;
+import org.springframework.cloud.netflix.eureka.server.advice.LeaseManagerLite;
 import org.springframework.context.ApplicationContext;
 
 import com.google.common.base.Optional;