diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml
index df8b259f..0cdb549d 100644
--- a/spring-cloud-netflix-eureka-server/pom.xml
+++ b/spring-cloud-netflix-eureka-server/pom.xml
@@ -17,17 +17,6 @@
 		<wro4j.version>1.7.6</wro4j.version>
 	</properties>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starters</artifactId>
-				<version>${spring-cloud.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -61,7 +50,6 @@
 		<dependency>
 			<groupId>com.netflix.eureka</groupId>
 			<artifactId>eureka-client</artifactId>
-			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.jersey</groupId>
@@ -95,9 +83,6 @@
 
 	<build>
 		<resources>
-			<resource>
-				<directory>target/generated-resources</directory>
-			</resource>
 			<resource>
 				<directory>src/main/resources</directory>
 				<excludes>
@@ -106,13 +91,34 @@
 			</resource>
 		</resources>
 		<plugins>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${basedir}/target/wro</outputDirectory>
+							<resources>
+								<resource>
+									<directory>src/main/resources/wro</directory>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>ro.isdc.wro4j</groupId>
 				<artifactId>wro4j-maven-plugin</artifactId>
 				<version>${wro4j.version}</version>
 				<executions>
 					<execution>
-						<phase>generate-resources</phase>
+						<phase>process-resources</phase>
 						<goals>
 							<goal>run</goal>
 						</goals>
@@ -120,11 +126,31 @@
 				</executions>
 				<configuration>
 					<wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
-					<destinationFolder>${basedir}/target/generated-resources/static/eureka/</destinationFolder>
-					<wroFile>${basedir}/src/main/resources/wro/wro.xml</wroFile>
-					<extraConfigFile>${basedir}/src/main/resources/wro/wro.properties</extraConfigFile>
+					<destinationFolder>${project.build.directory}/classes/static/eureka/</destinationFolder>
+					<wroFile>${project.build.directory}/wro/eureka/wro.xml</wroFile>
+					<extraConfigFile>${basedir}/src/main/resources/wro/eureka/wro.properties</extraConfigFile>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>add-resource</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>add-resource</goal>
+						</goals>
+						<configuration>
+							<resources>
+								<resource>
+									<directory>${project.build.directory}/generated-resources</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/.csscomb.json b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/.csscomb.json
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/.csscomb.json
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/.csscomb.json
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/.csslintrc b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/.csslintrc
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/.csslintrc
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/.csslintrc
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/alerts.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/alerts.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/alerts.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/alerts.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/badges.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/badges.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/badges.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/badges.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/bootstrap.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/bootstrap.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/bootstrap.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/bootstrap.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/breadcrumbs.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/breadcrumbs.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/breadcrumbs.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/breadcrumbs.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/button-groups.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/button-groups.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/button-groups.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/button-groups.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/buttons.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/buttons.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/buttons.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/buttons.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/carousel.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/carousel.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/carousel.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/carousel.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/close.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/close.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/close.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/close.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/code.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/code.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/code.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/code.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/component-animations.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/component-animations.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/component-animations.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/component-animations.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/dropdowns.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/dropdowns.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/dropdowns.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/dropdowns.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/forms.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/forms.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/forms.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/forms.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/glyphicons.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/glyphicons.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/glyphicons.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/glyphicons.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/grid.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/grid.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/grid.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/grid.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/input-groups.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/input-groups.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/input-groups.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/input-groups.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/jumbotron.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/jumbotron.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/jumbotron.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/jumbotron.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/labels.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/labels.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/labels.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/labels.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/list-group.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/list-group.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/list-group.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/list-group.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/media.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/media.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/media.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/media.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/alerts.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/alerts.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/alerts.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/alerts.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/background-variant.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/background-variant.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/background-variant.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/background-variant.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/border-radius.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/border-radius.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/border-radius.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/border-radius.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/buttons.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/buttons.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/buttons.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/buttons.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/center-block.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/center-block.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/center-block.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/center-block.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/clearfix.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/clearfix.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/clearfix.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/clearfix.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/forms.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/forms.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/forms.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/forms.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/gradients.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/gradients.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/gradients.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/gradients.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/grid-framework.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/grid-framework.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/grid-framework.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/grid-framework.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/grid.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/grid.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/grid.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/grid.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/hide-text.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/hide-text.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/hide-text.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/hide-text.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/image.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/image.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/image.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/image.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/labels.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/labels.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/labels.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/labels.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/list-group.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/list-group.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/list-group.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/list-group.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/nav-divider.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/nav-divider.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/nav-divider.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/nav-divider.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/nav-vertical-align.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/nav-vertical-align.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/nav-vertical-align.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/nav-vertical-align.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/opacity.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/opacity.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/opacity.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/opacity.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/pagination.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/pagination.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/pagination.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/pagination.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/panels.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/panels.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/panels.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/panels.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/progress-bar.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/progress-bar.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/progress-bar.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/progress-bar.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/reset-filter.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/reset-filter.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/reset-filter.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/reset-filter.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/resize.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/resize.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/resize.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/resize.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/responsive-visibility.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/responsive-visibility.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/responsive-visibility.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/responsive-visibility.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/size.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/size.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/size.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/size.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/tab-focus.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/tab-focus.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/tab-focus.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/tab-focus.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/table-row.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/table-row.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/table-row.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/table-row.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/text-emphasis.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/text-emphasis.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/text-emphasis.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/text-emphasis.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/text-overflow.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/text-overflow.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/text-overflow.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/text-overflow.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/vendor-prefixes.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/vendor-prefixes.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/mixins/vendor-prefixes.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/mixins/vendor-prefixes.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/modals.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/modals.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/modals.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/modals.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/navbar.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/navbar.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/navbar.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/navbar.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/navs.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/navs.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/navs.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/navs.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/normalize.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/normalize.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/normalize.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/normalize.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/pager.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/pager.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/pager.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/pager.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/pagination.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/pagination.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/pagination.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/pagination.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/panels.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/panels.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/panels.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/panels.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/popovers.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/popovers.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/popovers.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/popovers.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/print.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/print.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/print.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/print.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/progress-bars.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/progress-bars.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/progress-bars.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/progress-bars.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/responsive-embed.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/responsive-embed.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/responsive-embed.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/responsive-embed.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/responsive-utilities.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/responsive-utilities.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/responsive-utilities.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/responsive-utilities.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/scaffolding.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/scaffolding.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/scaffolding.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/scaffolding.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/tables.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/tables.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/tables.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/tables.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/theme.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/theme.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/theme.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/theme.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/thumbnails.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/thumbnails.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/thumbnails.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/thumbnails.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/tooltip.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/tooltip.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/tooltip.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/tooltip.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/type.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/type.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/type.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/type.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/utilities.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/utilities.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/utilities.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/utilities.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/variables.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/variables.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/variables.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/variables.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/wells.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/wells.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/bootstrap/less/wells.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/bootstrap/less/wells.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/header.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/header.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/header.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/header.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/main.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/main.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/main.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/main.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/responsive.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/responsive.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/responsive.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/responsive.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/typography.less b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/typography.less
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/typography.less
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/typography.less
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/wro.properties b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/wro.properties
similarity index 100%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/wro.properties
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/wro.properties
diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/wro/wro.xml b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/wro.xml
similarity index 50%
rename from spring-cloud-netflix-eureka-server/src/main/resources/wro/wro.xml
rename to spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/wro.xml
index af7ecbd9..54196f28 100644
--- a/spring-cloud-netflix-eureka-server/src/main/resources/wro/wro.xml
+++ b/spring-cloud-netflix-eureka-server/src/main/resources/wro/eureka/wro.xml
@@ -1,5 +1,5 @@
 <groups xmlns="http://www.isdc.ro/wro">
   <group name="wro">
-    <css>file:./src/main/resources/wro/main.less</css>
+    <css>file:${project.basedir}/src/main/resources/wro/eureka/main.less</css>
   </group>
 </groups>
\ No newline at end of file
diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java
index 6e914262..ab083d9c 100644
--- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java
+++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java
@@ -9,6 +9,7 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.test.IntegrationTest;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.TestRestTemplate;
@@ -22,32 +23,36 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = Application.class)
 @WebAppConfiguration
-@IntegrationTest({"server.port=0", "spring.application.name=eureka", "management.contextPath=/admin"})
+@IntegrationTest({ "server.port=0", "spring.application.name=eureka", "management.contextPath=/admin" })
 public class ApplicationTests {
-	
+
 	@Value("${local.server.port}")
 	private int port = 0;
-	
+
 	@Configuration
 	@EnableAutoConfiguration
 	@EnableEurekaServer
 	protected static class Application {
 		public static void main(String[] args) {
-			SpringApplication.run(Application.class, args);
+			new SpringApplicationBuilder(Application.class).properties(
+					"spring.application.name=eureka", "management.contextPath=/admin")
+					.run(args);
 		}
 	}
 
 	@Test
 	public void catalogLoads() {
 		@SuppressWarnings("rawtypes")
-		ResponseEntity<Map> entity = new TestRestTemplate().getForEntity("http://localhost:" + port + "/v2/apps", Map.class);
+		ResponseEntity<Map> entity = new TestRestTemplate().getForEntity(
+				"http://localhost:" + port + "/v2/apps", Map.class);
 		assertEquals(HttpStatus.OK, entity.getStatusCode());
 	}
 
 	@Test
 	public void adminLoads() {
 		@SuppressWarnings("rawtypes")
-		ResponseEntity<Map> entity = new TestRestTemplate().getForEntity("http://localhost:" + port + "/admin/env", Map.class);
+		ResponseEntity<Map> entity = new TestRestTemplate().getForEntity(
+				"http://localhost:" + port + "/admin/env", Map.class);
 		assertEquals(HttpStatus.OK, entity.getStatusCode());
 	}