diff --git a/basil/pom.xml b/basil/pom.xml
index 3303a91..877d894 100644
--- a/basil/pom.xml
+++ b/basil/pom.xml
@@ -125,12 +125,6 @@
 			<artifactId>jetty-webapp</artifactId>
 		</dependency>
 		
-		<!-- Standalone -->
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
-        
 		<!-- Swagger -->
 		<dependency>
 			<groupId>com.wordnik</groupId>
diff --git a/basil/src/main/java/uk/ac/open/kmi/basil/ApiDocsResource.java b/basil/src/main/java/uk/ac/open/kmi/basil/ApiDocsResource.java
index 7c6a63d..68bed59 100644
--- a/basil/src/main/java/uk/ac/open/kmi/basil/ApiDocsResource.java
+++ b/basil/src/main/java/uk/ac/open/kmi/basil/ApiDocsResource.java
@@ -1,16 +1,27 @@
 package uk.ac.open.kmi.basil;
 
-import com.google.gson.JsonObject;
-import com.wordnik.swagger.annotations.*;
+import java.io.IOException;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+
 import uk.ac.open.kmi.basil.doc.Doc;
 import uk.ac.open.kmi.basil.sparql.Specification;
 import uk.ac.open.kmi.basil.swagger.SwaggerJsonBuilder;
 import uk.ac.open.kmi.basil.swagger.SwaggerUIBuilder;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import java.io.IOException;
+import com.google.gson.JsonObject;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
 
 
 @Path("{id}/api-docs")
diff --git a/basil/src/main/webapp/static/index.html b/basil/src/main/webapp/static/index.html
deleted file mode 100644
index a5d0d22..0000000
--- a/basil/src/main/webapp/static/index.html
+++ /dev/null
@@ -1 +0,0 @@
-basil
\ No newline at end of file
diff --git a/basil/src/test/resources/log4j2-jetty.xml b/basil/src/test/resources/log4j2-jetty.xml
deleted file mode 100644
index eea2369..0000000
--- a/basil/src/test/resources/log4j2-jetty.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration>
-    <Appenders>
-        <Console name="STDOUT" target="SYSTEM_OUT">
-            <!-- PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/ -->
-            <PatternLayout pattern="[%-5p] %d %F:%L - %m%n"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-    <Logger name="org.apache.log4j.xml" level="info"/>
-        <Root level="info">
-            <AppenderRef ref="STDOUT"/>
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/server/pom.xml b/server/pom.xml
index be19f79..c2d9c7f 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -24,6 +24,14 @@
 		</dependency>
 		
 		
+        <!-- Standalone -->
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+        
+		
+		
 	</dependencies>
 
 	<build>
@@ -64,6 +72,21 @@
 					</execution>
 				</executions>
 			</plugin>
+			
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>9.3.0.M1</version>
+                <configuration>
+                    <scanIntervalSeconds>5</scanIntervalSeconds>
+                    <systemProperties>
+                        <systemProperty>
+                            <name>log4j.configurationFile</name>
+                            <value>${project.basedir}/src/test/resources/log4j2-jetty.xml</value>
+                        </systemProperty>
+                    </systemProperties>
+                </configuration>
+            </plugin>
 		</plugins>
 		<resources>
 			<resource>
diff --git a/basil/src/main/java/uk/ac/open/kmi/basil/server/Standalone.java b/server/src/main/java/uk/ac/open/kmi/basil/server/Standalone.java
similarity index 100%
rename from basil/src/main/java/uk/ac/open/kmi/basil/server/Standalone.java
rename to server/src/main/java/uk/ac/open/kmi/basil/server/Standalone.java
diff --git a/basil/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml
similarity index 92%
rename from basil/src/main/webapp/WEB-INF/web.xml
rename to server/src/main/webapp/WEB-INF/web.xml
index 3cae372..8fae54c 100644
--- a/basil/src/main/webapp/WEB-INF/web.xml
+++ b/server/src/main/webapp/WEB-INF/web.xml
@@ -65,7 +65,7 @@
 		<servlet-name>BASIL</servlet-name>
 		<url-pattern>/basil/*</url-pattern>
 	</servlet-mapping>
-
+ 
     <servlet>
         <servlet-name>Jersey2Config</servlet-name>
         <servlet-class>com.wordnik.swagger.jersey.config.JerseyJaxrsConfig</servlet-class>
@@ -90,9 +90,16 @@
         <load-on-startup>2</load-on-startup>
     </servlet>
 
+    
     <servlet-mapping>
         <servlet-name>default</servlet-name>
-        <url-pattern>/basil/docs/*</url-pattern>
+        <url-pattern>/ui/*</url-pattern>
     </servlet-mapping>
-
+    
+    <welcome-file-list>
+	   <welcome-file>static/ui/index.html</welcome-file>
+	   <welcome-file>index.html</welcome-file>
+	   <welcome-file>index.htm</welcome-file>
+	   <welcome-file>index.jsp</welcome-file>
+    </welcome-file-list>
 </web-app>
diff --git a/basil/src/main/webapp/static/swagger-ui/css/print.css b/server/src/main/webapp/static/swagger-ui/css/print.css
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/css/print.css
rename to server/src/main/webapp/static/swagger-ui/css/print.css
diff --git a/basil/src/main/webapp/static/swagger-ui/css/reset.css b/server/src/main/webapp/static/swagger-ui/css/reset.css
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/css/reset.css
rename to server/src/main/webapp/static/swagger-ui/css/reset.css
diff --git a/basil/src/main/webapp/static/swagger-ui/css/screen.css b/server/src/main/webapp/static/swagger-ui/css/screen.css
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/css/screen.css
rename to server/src/main/webapp/static/swagger-ui/css/screen.css
diff --git a/basil/src/main/webapp/static/swagger-ui/css/typography.css b/server/src/main/webapp/static/swagger-ui/css/typography.css
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/css/typography.css
rename to server/src/main/webapp/static/swagger-ui/css/typography.css
diff --git a/basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.eot b/server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.eot
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.eot
rename to server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.eot
diff --git a/basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.svg b/server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.svg
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.svg
rename to server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.svg
diff --git a/basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.ttf b/server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.ttf
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.ttf
rename to server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.ttf
diff --git a/basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.woff b/server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.woff
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.woff
rename to server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.woff
diff --git a/basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.woff2 b/server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.woff2
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.woff2
rename to server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-700.woff2
diff --git a/basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.eot b/server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.eot
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.eot
rename to server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.eot
diff --git a/basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.svg b/server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.svg
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.svg
rename to server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.svg
diff --git a/basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf b/server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf
rename to server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf
diff --git a/basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.woff b/server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.woff
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.woff
rename to server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.woff
diff --git a/basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2 b/server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2
rename to server/src/main/webapp/static/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2
diff --git a/basil/src/main/webapp/static/swagger-ui/images/explorer_icons.png b/server/src/main/webapp/static/swagger-ui/images/explorer_icons.png
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/images/explorer_icons.png
rename to server/src/main/webapp/static/swagger-ui/images/explorer_icons.png
diff --git a/basil/src/main/webapp/static/swagger-ui/images/favicon-16x16.png b/server/src/main/webapp/static/swagger-ui/images/favicon-16x16.png
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/images/favicon-16x16.png
rename to server/src/main/webapp/static/swagger-ui/images/favicon-16x16.png
diff --git a/basil/src/main/webapp/static/swagger-ui/images/favicon-32x32.png b/server/src/main/webapp/static/swagger-ui/images/favicon-32x32.png
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/images/favicon-32x32.png
rename to server/src/main/webapp/static/swagger-ui/images/favicon-32x32.png
diff --git a/basil/src/main/webapp/static/swagger-ui/images/favicon.ico b/server/src/main/webapp/static/swagger-ui/images/favicon.ico
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/images/favicon.ico
rename to server/src/main/webapp/static/swagger-ui/images/favicon.ico
diff --git a/basil/src/main/webapp/static/swagger-ui/images/logo_small.png b/server/src/main/webapp/static/swagger-ui/images/logo_small.png
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/images/logo_small.png
rename to server/src/main/webapp/static/swagger-ui/images/logo_small.png
diff --git a/basil/src/main/webapp/static/swagger-ui/images/pet_store_api.png b/server/src/main/webapp/static/swagger-ui/images/pet_store_api.png
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/images/pet_store_api.png
rename to server/src/main/webapp/static/swagger-ui/images/pet_store_api.png
diff --git a/basil/src/main/webapp/static/swagger-ui/images/throbber.gif b/server/src/main/webapp/static/swagger-ui/images/throbber.gif
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/images/throbber.gif
rename to server/src/main/webapp/static/swagger-ui/images/throbber.gif
diff --git a/basil/src/main/webapp/static/swagger-ui/images/wordnik_api.png b/server/src/main/webapp/static/swagger-ui/images/wordnik_api.png
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/images/wordnik_api.png
rename to server/src/main/webapp/static/swagger-ui/images/wordnik_api.png
diff --git a/basil/src/main/webapp/static/swagger-ui/lib/backbone-min.js b/server/src/main/webapp/static/swagger-ui/lib/backbone-min.js
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/lib/backbone-min.js
rename to server/src/main/webapp/static/swagger-ui/lib/backbone-min.js
diff --git a/basil/src/main/webapp/static/swagger-ui/lib/handlebars-2.0.0.js b/server/src/main/webapp/static/swagger-ui/lib/handlebars-2.0.0.js
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/lib/handlebars-2.0.0.js
rename to server/src/main/webapp/static/swagger-ui/lib/handlebars-2.0.0.js
diff --git a/basil/src/main/webapp/static/swagger-ui/lib/highlight.7.3.pack.js b/server/src/main/webapp/static/swagger-ui/lib/highlight.7.3.pack.js
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/lib/highlight.7.3.pack.js
rename to server/src/main/webapp/static/swagger-ui/lib/highlight.7.3.pack.js
diff --git a/basil/src/main/webapp/static/swagger-ui/lib/jquery-1.8.0.min.js b/server/src/main/webapp/static/swagger-ui/lib/jquery-1.8.0.min.js
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/lib/jquery-1.8.0.min.js
rename to server/src/main/webapp/static/swagger-ui/lib/jquery-1.8.0.min.js
diff --git a/basil/src/main/webapp/static/swagger-ui/lib/jquery.ba-bbq.min.js b/server/src/main/webapp/static/swagger-ui/lib/jquery.ba-bbq.min.js
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/lib/jquery.ba-bbq.min.js
rename to server/src/main/webapp/static/swagger-ui/lib/jquery.ba-bbq.min.js
diff --git a/basil/src/main/webapp/static/swagger-ui/lib/jquery.slideto.min.js b/server/src/main/webapp/static/swagger-ui/lib/jquery.slideto.min.js
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/lib/jquery.slideto.min.js
rename to server/src/main/webapp/static/swagger-ui/lib/jquery.slideto.min.js
diff --git a/basil/src/main/webapp/static/swagger-ui/lib/jquery.wiggle.min.js b/server/src/main/webapp/static/swagger-ui/lib/jquery.wiggle.min.js
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/lib/jquery.wiggle.min.js
rename to server/src/main/webapp/static/swagger-ui/lib/jquery.wiggle.min.js
diff --git a/basil/src/main/webapp/static/swagger-ui/lib/marked.js b/server/src/main/webapp/static/swagger-ui/lib/marked.js
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/lib/marked.js
rename to server/src/main/webapp/static/swagger-ui/lib/marked.js
diff --git a/basil/src/main/webapp/static/swagger-ui/lib/swagger-oauth.js b/server/src/main/webapp/static/swagger-ui/lib/swagger-oauth.js
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/lib/swagger-oauth.js
rename to server/src/main/webapp/static/swagger-ui/lib/swagger-oauth.js
diff --git a/basil/src/main/webapp/static/swagger-ui/lib/underscore-min.js b/server/src/main/webapp/static/swagger-ui/lib/underscore-min.js
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/lib/underscore-min.js
rename to server/src/main/webapp/static/swagger-ui/lib/underscore-min.js
diff --git a/basil/src/main/webapp/static/swagger-ui/lib/underscore-min.map b/server/src/main/webapp/static/swagger-ui/lib/underscore-min.map
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/lib/underscore-min.map
rename to server/src/main/webapp/static/swagger-ui/lib/underscore-min.map
diff --git a/basil/src/main/webapp/static/swagger-ui/o2c.html b/server/src/main/webapp/static/swagger-ui/o2c.html
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/o2c.html
rename to server/src/main/webapp/static/swagger-ui/o2c.html
diff --git a/basil/src/main/webapp/static/swagger-ui/swagger-ui.js b/server/src/main/webapp/static/swagger-ui/swagger-ui.js
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/swagger-ui.js
rename to server/src/main/webapp/static/swagger-ui/swagger-ui.js
diff --git a/basil/src/main/webapp/static/swagger-ui/swagger-ui.min.js b/server/src/main/webapp/static/swagger-ui/swagger-ui.min.js
similarity index 100%
rename from basil/src/main/webapp/static/swagger-ui/swagger-ui.min.js
rename to server/src/main/webapp/static/swagger-ui/swagger-ui.min.js