111 files changed, 65 insertions, 122 deletions

diff --git a/build.gradle b/build.gradle
index 44c69936..91d6d56c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 }
 plugins {
-    id 'org.springframework.boot' version '2.0.0.RELEASE'
+    id 'org.springframework.boot' version '2.0.0.RELEASE' apply false
 }
 allprojects {
     repositories {
@@ -17,11 +17,15 @@ allprojects {
         maven { url "https://jitpack.io" }
         maven { url "https://repository.apache.org/content/repositories/snapshots/" }
     }
-    apply plugin: 'java'
-    apply plugin: 'org.springframework.boot'
+
     apply plugin: 'io.spring.dependency-management'
-    apply plugin: 'com.github.ben-manes.versions'
+    dependencyManagement {
+        imports {
+            mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES
+        }
+    }
 
+    apply plugin: 'com.github.ben-manes.versions'
     dependencyUpdates.resolutionStrategy = {
         componentSelection { rules ->
           rules.all { ComponentSelection selection ->
@@ -36,19 +40,15 @@ allprojects {
     }
 }
 
-repositories {
-    jcenter()
-}
+apply plugin: 'java'
+
 dependencies {
-    testCompile project(':juick-core')
-    testCompile project(':juick-www')
+    compile project(':juick-common')
 
     testCompile "org.json:json:20180130"
-    compile("org.springframework.boot:spring-boot-starter-jdbc")
-    compile("org.springframework.boot:spring-boot-starter-test")
+    testCompile("org.springframework.boot:spring-boot-starter-jdbc")
+    testCompile("org.springframework.boot:spring-boot-starter-test")
     testRuntime "mysql:mysql-connector-java:5.1.40"
     testRuntime "org.postgresql:postgresql:42.2.1"
 }
 
-compileJava.options.encoding = 'UTF-8'
-
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 568c50bf..4d019d37 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Mar 16 09:17:03 MSK 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip
diff --git a/juick-common/build.gradle b/juick-common/build.gradle
new file mode 100644
index 00000000..bf81aee5
--- /dev/null
+++ b/juick-common/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'java'
+
+dependencies {
+    compile("org.springframework.boot:spring-boot-starter-security")
+    compile("org.springframework.boot:spring-boot-starter-web")
+    compile("org.springframework.boot:spring-boot-starter-websocket")
+    compile "org.apache.commons:commons-lang3:3.7"
+    compile "org.apache.commons:commons-collections4:4.1"
+    compile "commons-codec:commons-codec:1.11"
+    compile "commons-io:commons-io:2.6"
+    compile 'com.google.code.findbugs:jsr305:3.0.2'
+    compile 'org.ocpsoft.prettytime:prettytime:4.0.1.Final'
+    compile 'org.imgscalr:imgscalr-lib:4.2'
+    compile "org.apache.commons:commons-imaging:1.0-SNAPSHOT"
+
+    compile ('com.github.juick:com.juick.xmpp:658f8cf751') {
+        exclude group: 'xmlpull'
+    }
+    compile 'xpp3:xpp3:1.1.4c'
+
+    compile "rocks.xmpp:xmpp-core-client:0.7.5"
+    compile "rocks.xmpp:xmpp-extensions-client:0.7.5"
+
+    compile "javax.inject:javax.inject:1"
+    testCompile("org.springframework.boot:spring-boot-starter-test")
+}
diff --git a/juick-core/src/main/java/com/juick/Attachment.java b/juick-common/src/main/java/com/juick/Attachment.java
index 76f2995a..76f2995a 100644
--- a/juick-core/src/main/java/com/juick/Attachment.java
+++ b/juick-common/src/main/java/com/juick/Attachment.java
diff --git a/juick-core/src/main/java/com/juick/ExternalToken.java b/juick-common/src/main/java/com/juick/ExternalToken.java
index f6094478..f6094478 100644
--- a/juick-core/src/main/java/com/juick/ExternalToken.java
+++ b/juick-common/src/main/java/com/juick/ExternalToken.java
diff --git a/juick-core/src/main/java/com/juick/Message.java b/juick-common/src/main/java/com/juick/Message.java
index 699920f6..e574e3cc 100644
--- a/juick-core/src/main/java/com/juick/Message.java
+++ b/juick-common/src/main/java/com/juick/Message.java
@@ -19,7 +19,7 @@ package com.juick;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.juick.xml.adapters.SimpleDateAdapter;
+import com.juick.adapters.SimpleDateAdapter;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
diff --git a/juick-core/src/main/java/com/juick/Photo.java b/juick-common/src/main/java/com/juick/Photo.java
index 06299610..06299610 100644
--- a/juick-core/src/main/java/com/juick/Photo.java
+++ b/juick-common/src/main/java/com/juick/Photo.java
diff --git a/juick-core/src/main/java/com/juick/Recommendation.java b/juick-common/src/main/java/com/juick/Recommendation.java
index 0a74b9ea..0a74b9ea 100644
--- a/juick-core/src/main/java/com/juick/Recommendation.java
+++ b/juick-common/src/main/java/com/juick/Recommendation.java
diff --git a/juick-core/src/main/java/com/juick/Status.java b/juick-common/src/main/java/com/juick/Status.java
index d7983536..d7983536 100644
--- a/juick-core/src/main/java/com/juick/Status.java
+++ b/juick-common/src/main/java/com/juick/Status.java
diff --git a/juick-core/src/main/java/com/juick/Tag.java b/juick-common/src/main/java/com/juick/Tag.java
index 29e5c767..29e5c767 100644
--- a/juick-core/src/main/java/com/juick/Tag.java
+++ b/juick-common/src/main/java/com/juick/Tag.java
diff --git a/juick-core/src/main/java/com/juick/User.java b/juick-common/src/main/java/com/juick/User.java
index 478c6a48..478c6a48 100644
--- a/juick-core/src/main/java/com/juick/User.java
+++ b/juick-common/src/main/java/com/juick/User.java
diff --git a/juick-core/src/main/java/com/juick/xml/adapters/SimpleDateAdapter.java b/juick-common/src/main/java/com/juick/adapters/SimpleDateAdapter.java
index 6dd40582..b8e08599 100644
--- a/juick-core/src/main/java/com/juick/xml/adapters/SimpleDateAdapter.java
+++ b/juick-common/src/main/java/com/juick/adapters/SimpleDateAdapter.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.xml.adapters;
+package com.juick.adapters;
 
 import com.juick.util.DateFormattersHolder;
 
diff --git a/juick-core/src/main/java/com/juick/formatters/PlainTextFormatter.java b/juick-common/src/main/java/com/juick/formatters/PlainTextFormatter.java
index c599d33b..c599d33b 100644
--- a/juick-core/src/main/java/com/juick/formatters/PlainTextFormatter.java
+++ b/juick-common/src/main/java/com/juick/formatters/PlainTextFormatter.java
diff --git a/juick-core/src/main/java/com/juick/package-info.java b/juick-common/src/main/java/com/juick/package-info.java
index c9023417..c9023417 100644
--- a/juick-core/src/main/java/com/juick/package-info.java
+++ b/juick-common/src/main/java/com/juick/package-info.java
diff --git a/juick-server-web/src/main/java/com/juick/server/component/DisconnectedEvent.java b/juick-common/src/main/java/com/juick/server/component/DisconnectedEvent.java
index 9da6d7a9..9da6d7a9 100644
--- a/juick-server-web/src/main/java/com/juick/server/component/DisconnectedEvent.java
+++ b/juick-common/src/main/java/com/juick/server/component/DisconnectedEvent.java
diff --git a/juick-server-web/src/main/java/com/juick/server/component/JuickServerComponent.java b/juick-common/src/main/java/com/juick/server/component/JuickServerComponent.java
index 792f446f..792f446f 100644
--- a/juick-server-web/src/main/java/com/juick/server/component/JuickServerComponent.java
+++ b/juick-common/src/main/java/com/juick/server/component/JuickServerComponent.java
diff --git a/juick-server-web/src/main/java/com/juick/server/component/JuickServerReconnectManager.java b/juick-common/src/main/java/com/juick/server/component/JuickServerReconnectManager.java
index a662e4fb..a662e4fb 100644
--- a/juick-server-web/src/main/java/com/juick/server/component/JuickServerReconnectManager.java
+++ b/juick-common/src/main/java/com/juick/server/component/JuickServerReconnectManager.java
diff --git a/juick-server-web/src/main/java/com/juick/server/component/MessageEvent.java b/juick-common/src/main/java/com/juick/server/component/MessageEvent.java
index 048de6a6..048de6a6 100644
--- a/juick-server-web/src/main/java/com/juick/server/component/MessageEvent.java
+++ b/juick-common/src/main/java/com/juick/server/component/MessageEvent.java
diff --git a/juick-server-web/src/main/java/com/juick/server/component/UserUpdatedEvent.java b/juick-common/src/main/java/com/juick/server/component/UserUpdatedEvent.java
index 059aeefd..059aeefd 100644
--- a/juick-server-web/src/main/java/com/juick/server/component/UserUpdatedEvent.java
+++ b/juick-common/src/main/java/com/juick/server/component/UserUpdatedEvent.java
diff --git a/juick-server-web/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java b/juick-common/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
index d9b842af..d9b842af 100644
--- a/juick-server-web/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
+++ b/juick-common/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
diff --git a/juick-server-web/src/main/java/com/juick/server/configuration/JuickServerWebsocketConfiguration.java b/juick-common/src/main/java/com/juick/server/configuration/JuickServerWebsocketConfiguration.java
index 18501eaf..18501eaf 100644
--- a/juick-server-web/src/main/java/com/juick/server/configuration/JuickServerWebsocketConfiguration.java
+++ b/juick-common/src/main/java/com/juick/server/configuration/JuickServerWebsocketConfiguration.java
diff --git a/juick-server-web/src/main/java/com/juick/server/configuration/StorageConfiguration.java b/juick-common/src/main/java/com/juick/server/configuration/StorageConfiguration.java
index 94b23037..94b23037 100644
--- a/juick-server-web/src/main/java/com/juick/server/configuration/StorageConfiguration.java
+++ b/juick-common/src/main/java/com/juick/server/configuration/StorageConfiguration.java
diff --git a/juick-server-core/src/main/java/com/juick/server/helpers/AnonymousUser.java b/juick-common/src/main/java/com/juick/server/helpers/AnonymousUser.java
index 122bbe29..122bbe29 100644
--- a/juick-server-core/src/main/java/com/juick/server/helpers/AnonymousUser.java
+++ b/juick-common/src/main/java/com/juick/server/helpers/AnonymousUser.java
diff --git a/juick-server-core/src/main/java/com/juick/server/helpers/ApplicationStatus.java b/juick-common/src/main/java/com/juick/server/helpers/ApplicationStatus.java
index 8f57b2a6..8f57b2a6 100644
--- a/juick-server-core/src/main/java/com/juick/server/helpers/ApplicationStatus.java
+++ b/juick-common/src/main/java/com/juick/server/helpers/ApplicationStatus.java
diff --git a/juick-server-core/src/main/java/com/juick/server/helpers/Auth.java b/juick-common/src/main/java/com/juick/server/helpers/Auth.java
index d01efadd..d01efadd 100644
--- a/juick-server-core/src/main/java/com/juick/server/helpers/Auth.java
+++ b/juick-common/src/main/java/com/juick/server/helpers/Auth.java
diff --git a/juick-server-core/src/main/java/com/juick/server/helpers/NotifyOpts.java b/juick-common/src/main/java/com/juick/server/helpers/NotifyOpts.java
index 0e49a424..0e49a424 100644
--- a/juick-server-core/src/main/java/com/juick/server/helpers/NotifyOpts.java
+++ b/juick-common/src/main/java/com/juick/server/helpers/NotifyOpts.java
diff --git a/juick-server-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java b/juick-common/src/main/java/com/juick/server/helpers/PrivacyOpts.java
index 86281d4a..86281d4a 100644
--- a/juick-server-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java
+++ b/juick-common/src/main/java/com/juick/server/helpers/PrivacyOpts.java
diff --git a/juick-server-core/src/main/java/com/juick/server/helpers/PrivateChats.java b/juick-common/src/main/java/com/juick/server/helpers/PrivateChats.java
index 6e446f98..6e446f98 100644
--- a/juick-server-core/src/main/java/com/juick/server/helpers/PrivateChats.java
+++ b/juick-common/src/main/java/com/juick/server/helpers/PrivateChats.java
diff --git a/juick-server-core/src/main/java/com/juick/server/helpers/ResponseReply.java b/juick-common/src/main/java/com/juick/server/helpers/ResponseReply.java
index 91ba2b8a..91ba2b8a 100644
--- a/juick-server-core/src/main/java/com/juick/server/helpers/ResponseReply.java
+++ b/juick-common/src/main/java/com/juick/server/helpers/ResponseReply.java
diff --git a/juick-server-core/src/main/java/com/juick/server/helpers/TagStats.java b/juick-common/src/main/java/com/juick/server/helpers/TagStats.java
index ab24983f..ab24983f 100644
--- a/juick-server-core/src/main/java/com/juick/server/helpers/TagStats.java
+++ b/juick-common/src/main/java/com/juick/server/helpers/TagStats.java
diff --git a/juick-server-core/src/main/java/com/juick/server/helpers/UserInfo.java b/juick-common/src/main/java/com/juick/server/helpers/UserInfo.java
index 284cd2e8..284cd2e8 100644
--- a/juick-server-core/src/main/java/com/juick/server/helpers/UserInfo.java
+++ b/juick-common/src/main/java/com/juick/server/helpers/UserInfo.java
diff --git a/juick-server-web/src/main/java/com/juick/server/protocol/JuickProtocol.java b/juick-common/src/main/java/com/juick/server/protocol/JuickProtocol.java
index 1be34a3f..1be34a3f 100644
--- a/juick-server-web/src/main/java/com/juick/server/protocol/JuickProtocol.java
+++ b/juick-common/src/main/java/com/juick/server/protocol/JuickProtocol.java
diff --git a/juick-server-web/src/main/java/com/juick/server/protocol/ProtocolListener.java b/juick-common/src/main/java/com/juick/server/protocol/ProtocolListener.java
index f051e6d0..f051e6d0 100644
--- a/juick-server-web/src/main/java/com/juick/server/protocol/ProtocolListener.java
+++ b/juick-common/src/main/java/com/juick/server/protocol/ProtocolListener.java
diff --git a/juick-server-web/src/main/java/com/juick/server/protocol/annotation/UserCommand.java b/juick-common/src/main/java/com/juick/server/protocol/annotation/UserCommand.java
index ab37a4e1..ab37a4e1 100644
--- a/juick-server-web/src/main/java/com/juick/server/protocol/annotation/UserCommand.java
+++ b/juick-common/src/main/java/com/juick/server/protocol/annotation/UserCommand.java
diff --git a/juick-server-core/src/main/java/com/juick/server/util/HashUtils.java b/juick-common/src/main/java/com/juick/server/util/HashUtils.java
index b4500457..b4500457 100644
--- a/juick-server-core/src/main/java/com/juick/server/util/HashUtils.java
+++ b/juick-common/src/main/java/com/juick/server/util/HashUtils.java
diff --git a/juick-server-web/src/main/java/com/juick/server/util/HttpBadRequestException.java b/juick-common/src/main/java/com/juick/server/util/HttpBadRequestException.java
index 1c3b4e66..1c3b4e66 100644
--- a/juick-server-web/src/main/java/com/juick/server/util/HttpBadRequestException.java
+++ b/juick-common/src/main/java/com/juick/server/util/HttpBadRequestException.java
diff --git a/juick-server-web/src/main/java/com/juick/server/util/HttpForbiddenException.java b/juick-common/src/main/java/com/juick/server/util/HttpForbiddenException.java
index 3251ca38..3251ca38 100644
--- a/juick-server-web/src/main/java/com/juick/server/util/HttpForbiddenException.java
+++ b/juick-common/src/main/java/com/juick/server/util/HttpForbiddenException.java
diff --git a/juick-server-web/src/main/java/com/juick/server/util/HttpNotFoundException.java b/juick-common/src/main/java/com/juick/server/util/HttpNotFoundException.java
index f66ece8b..f66ece8b 100644
--- a/juick-server-web/src/main/java/com/juick/server/util/HttpNotFoundException.java
+++ b/juick-common/src/main/java/com/juick/server/util/HttpNotFoundException.java
diff --git a/juick-server-web/src/main/java/com/juick/server/util/HttpUtils.java b/juick-common/src/main/java/com/juick/server/util/HttpUtils.java
index 35f594f3..35f594f3 100644
--- a/juick-server-web/src/main/java/com/juick/server/util/HttpUtils.java
+++ b/juick-common/src/main/java/com/juick/server/util/HttpUtils.java
diff --git a/juick-server-web/src/main/java/com/juick/server/util/ImageUtils.java b/juick-common/src/main/java/com/juick/server/util/ImageUtils.java
index 94ecf71e..94ecf71e 100644
--- a/juick-server-web/src/main/java/com/juick/server/util/ImageUtils.java
+++ b/juick-common/src/main/java/com/juick/server/util/ImageUtils.java
diff --git a/juick-server-core/src/main/java/com/juick/server/util/TagUtils.java b/juick-common/src/main/java/com/juick/server/util/TagUtils.java
index 9edeab32..9edeab32 100644
--- a/juick-server-core/src/main/java/com/juick/server/util/TagUtils.java
+++ b/juick-common/src/main/java/com/juick/server/util/TagUtils.java
diff --git a/juick-server-web/src/main/java/com/juick/server/util/UserUtils.java b/juick-common/src/main/java/com/juick/server/util/UserUtils.java
index ab5c320b..ab5c320b 100644
--- a/juick-server-web/src/main/java/com/juick/server/util/UserUtils.java
+++ b/juick-common/src/main/java/com/juick/server/util/UserUtils.java
diff --git a/juick-server-web/src/main/java/com/juick/server/util/WebUtils.java b/juick-common/src/main/java/com/juick/server/util/WebUtils.java
index 9dd628ee..9dd628ee 100644
--- a/juick-server-web/src/main/java/com/juick/server/util/WebUtils.java
+++ b/juick-common/src/main/java/com/juick/server/util/WebUtils.java
diff --git a/juick-server-web/src/main/java/com/juick/server/xmpp/JidConverter.java b/juick-common/src/main/java/com/juick/server/xmpp/JidConverter.java
index e9a9707e..e9a9707e 100644
--- a/juick-server-web/src/main/java/com/juick/server/xmpp/JidConverter.java
+++ b/juick-common/src/main/java/com/juick/server/xmpp/JidConverter.java
diff --git a/juick-server-web/src/main/java/com/juick/server/xmpp/extensions/JuickMessage.java b/juick-common/src/main/java/com/juick/server/xmpp/extensions/JuickMessage.java
index 6956a99a..6956a99a 100644
--- a/juick-server-web/src/main/java/com/juick/server/xmpp/extensions/JuickMessage.java
+++ b/juick-common/src/main/java/com/juick/server/xmpp/extensions/JuickMessage.java
diff --git a/juick-server-web/src/main/java/com/juick/server/xmpp/extensions/JuickUser.java b/juick-common/src/main/java/com/juick/server/xmpp/extensions/JuickUser.java
index 534efcc9..534efcc9 100644
--- a/juick-server-web/src/main/java/com/juick/server/xmpp/extensions/JuickUser.java
+++ b/juick-common/src/main/java/com/juick/server/xmpp/extensions/JuickUser.java
diff --git a/juick-server-web/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java b/juick-common/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java
index 647f2717..647f2717 100644
--- a/juick-server-web/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java
+++ b/juick-common/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java
diff --git a/juick-server-web/src/main/java/com/juick/service/BaseRestService.java b/juick-common/src/main/java/com/juick/service/BaseRestService.java
index 13604a89..13604a89 100644
--- a/juick-server-web/src/main/java/com/juick/service/BaseRestService.java
+++ b/juick-common/src/main/java/com/juick/service/BaseRestService.java
diff --git a/juick-server-core/src/main/java/com/juick/service/CrosspostService.java b/juick-common/src/main/java/com/juick/service/CrosspostService.java
index b82621e5..b82621e5 100644
--- a/juick-server-core/src/main/java/com/juick/service/CrosspostService.java
+++ b/juick-common/src/main/java/com/juick/service/CrosspostService.java
diff --git a/juick-server-core/src/main/java/com/juick/service/EmailService.java b/juick-common/src/main/java/com/juick/service/EmailService.java
index 2440bcb4..2440bcb4 100644
--- a/juick-server-core/src/main/java/com/juick/service/EmailService.java
+++ b/juick-common/src/main/java/com/juick/service/EmailService.java
diff --git a/juick-server-core/src/main/java/com/juick/service/ImagesService.java b/juick-common/src/main/java/com/juick/service/ImagesService.java
index b5cff16e..b5cff16e 100644
--- a/juick-server-core/src/main/java/com/juick/service/ImagesService.java
+++ b/juick-common/src/main/java/com/juick/service/ImagesService.java
diff --git a/juick-server-web/src/main/java/com/juick/service/ImagesServiceImpl.java b/juick-common/src/main/java/com/juick/service/ImagesServiceImpl.java
index 3a5c77dd..3a5c77dd 100644
--- a/juick-server-web/src/main/java/com/juick/service/ImagesServiceImpl.java
+++ b/juick-common/src/main/java/com/juick/service/ImagesServiceImpl.java
diff --git a/juick-server-core/src/main/java/com/juick/service/MessagesService.java b/juick-common/src/main/java/com/juick/service/MessagesService.java
index 2a3e701e..341175dd 100644
--- a/juick-server-core/src/main/java/com/juick/service/MessagesService.java
+++ b/juick-common/src/main/java/com/juick/service/MessagesService.java
@@ -20,7 +20,6 @@ package com.juick.service;
 import com.juick.User;
 import com.juick.server.helpers.ResponseReply;
 
-import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
 
diff --git a/juick-server-core/src/main/java/com/juick/service/MessengerService.java b/juick-common/src/main/java/com/juick/service/MessengerService.java
index e07c73fe..e07c73fe 100644
--- a/juick-server-core/src/main/java/com/juick/service/MessengerService.java
+++ b/juick-common/src/main/java/com/juick/service/MessengerService.java
diff --git a/juick-server-core/src/main/java/com/juick/service/PMQueriesService.java b/juick-common/src/main/java/com/juick/service/PMQueriesService.java
index 4c70eece..4c70eece 100644
--- a/juick-server-core/src/main/java/com/juick/service/PMQueriesService.java
+++ b/juick-common/src/main/java/com/juick/service/PMQueriesService.java
diff --git a/juick-server-core/src/main/java/com/juick/service/PrivacyQueriesService.java b/juick-common/src/main/java/com/juick/service/PrivacyQueriesService.java
index 17dd6a9b..17dd6a9b 100644
--- a/juick-server-core/src/main/java/com/juick/service/PrivacyQueriesService.java
+++ b/juick-common/src/main/java/com/juick/service/PrivacyQueriesService.java
diff --git a/juick-server-core/src/main/java/com/juick/service/PushQueriesService.java b/juick-common/src/main/java/com/juick/service/PushQueriesService.java
index f84a83e4..f84a83e4 100644
--- a/juick-server-core/src/main/java/com/juick/service/PushQueriesService.java
+++ b/juick-common/src/main/java/com/juick/service/PushQueriesService.java
diff --git a/juick-server-core/src/main/java/com/juick/service/ShowQueriesService.java b/juick-common/src/main/java/com/juick/service/ShowQueriesService.java
index 32b34b4e..32b34b4e 100644
--- a/juick-server-core/src/main/java/com/juick/service/ShowQueriesService.java
+++ b/juick-common/src/main/java/com/juick/service/ShowQueriesService.java
diff --git a/juick-server-core/src/main/java/com/juick/service/SubscriptionService.java b/juick-common/src/main/java/com/juick/service/SubscriptionService.java
index 47f81415..47f81415 100644
--- a/juick-server-core/src/main/java/com/juick/service/SubscriptionService.java
+++ b/juick-common/src/main/java/com/juick/service/SubscriptionService.java
diff --git a/juick-server-core/src/main/java/com/juick/service/TagService.java b/juick-common/src/main/java/com/juick/service/TagService.java
index 7cd7768f..7cd7768f 100644
--- a/juick-server-core/src/main/java/com/juick/service/TagService.java
+++ b/juick-common/src/main/java/com/juick/service/TagService.java
diff --git a/juick-server-core/src/main/java/com/juick/service/TelegramService.java b/juick-common/src/main/java/com/juick/service/TelegramService.java
index 7786ca9f..7786ca9f 100644
--- a/juick-server-core/src/main/java/com/juick/service/TelegramService.java
+++ b/juick-common/src/main/java/com/juick/service/TelegramService.java
diff --git a/juick-server-core/src/main/java/com/juick/service/UserService.java b/juick-common/src/main/java/com/juick/service/UserService.java
index 115c7dfc..115c7dfc 100644
--- a/juick-server-core/src/main/java/com/juick/service/UserService.java
+++ b/juick-common/src/main/java/com/juick/service/UserService.java
diff --git a/juick-server-core/src/main/java/com/juick/service/search/SearchService.java b/juick-common/src/main/java/com/juick/service/search/SearchService.java
index b1ea9374..b1ea9374 100644
--- a/juick-server-core/src/main/java/com/juick/service/search/SearchService.java
+++ b/juick-common/src/main/java/com/juick/service/search/SearchService.java
diff --git a/juick-server-web/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java b/juick-common/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
index b56b98c8..b56b98c8 100644
--- a/juick-server-web/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
+++ b/juick-common/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
diff --git a/juick-server-web/src/main/java/com/juick/service/security/JuickUserDetailsService.java b/juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java
index f6ae8909..f6ae8909 100644
--- a/juick-server-web/src/main/java/com/juick/service/security/JuickUserDetailsService.java
+++ b/juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java
diff --git a/juick-server-web/src/main/java/com/juick/service/security/NotAuthorizedAuthenticationEntryPoint.java b/juick-common/src/main/java/com/juick/service/security/NotAuthorizedAuthenticationEntryPoint.java
index b9bdcaa9..b9bdcaa9 100644
--- a/juick-server-web/src/main/java/com/juick/service/security/NotAuthorizedAuthenticationEntryPoint.java
+++ b/juick-common/src/main/java/com/juick/service/security/NotAuthorizedAuthenticationEntryPoint.java
diff --git a/juick-server-web/src/main/java/com/juick/service/security/NullUserDetailsService.java b/juick-common/src/main/java/com/juick/service/security/NullUserDetailsService.java
index 91acefa3..91acefa3 100644
--- a/juick-server-web/src/main/java/com/juick/service/security/NullUserDetailsService.java
+++ b/juick-common/src/main/java/com/juick/service/security/NullUserDetailsService.java
diff --git a/juick-server-web/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java b/juick-common/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java
index a8b956c1..a8b956c1 100644
--- a/juick-server-web/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java
+++ b/juick-common/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java
diff --git a/juick-server-web/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java b/juick-common/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java
index 04794d07..04794d07 100644
--- a/juick-server-web/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java
+++ b/juick-common/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java
diff --git a/juick-server-web/src/main/java/com/juick/service/security/entities/JuickUser.java b/juick-common/src/main/java/com/juick/service/security/entities/JuickUser.java
index 6e72117e..6e72117e 100644
--- a/juick-server-web/src/main/java/com/juick/service/security/entities/JuickUser.java
+++ b/juick-common/src/main/java/com/juick/service/security/entities/JuickUser.java
diff --git a/juick-core/src/main/java/com/juick/util/DateFormatter.java b/juick-common/src/main/java/com/juick/util/DateFormatter.java
index f9e23a91..f9e23a91 100644
--- a/juick-core/src/main/java/com/juick/util/DateFormatter.java
+++ b/juick-common/src/main/java/com/juick/util/DateFormatter.java
diff --git a/juick-core/src/main/java/com/juick/util/DateFormattersHolder.java b/juick-common/src/main/java/com/juick/util/DateFormattersHolder.java
index 09fd17d7..09fd17d7 100644
--- a/juick-core/src/main/java/com/juick/util/DateFormattersHolder.java
+++ b/juick-common/src/main/java/com/juick/util/DateFormattersHolder.java
diff --git a/juick-core/src/main/java/com/juick/util/MessageUtils.java b/juick-common/src/main/java/com/juick/util/MessageUtils.java
index 87a10351..87a10351 100644
--- a/juick-core/src/main/java/com/juick/util/MessageUtils.java
+++ b/juick-common/src/main/java/com/juick/util/MessageUtils.java
diff --git a/juick-core/src/main/java/com/juick/util/PrettyTimeFormatter.java b/juick-common/src/main/java/com/juick/util/PrettyTimeFormatter.java
index 383f4d9a..383f4d9a 100644
--- a/juick-core/src/main/java/com/juick/util/PrettyTimeFormatter.java
+++ b/juick-common/src/main/java/com/juick/util/PrettyTimeFormatter.java
diff --git a/juick-server-web/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java b/juick-common/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
index bbf35996..bbf35996 100644
--- a/juick-server-web/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
+++ b/juick-common/src/main/java/rocks/xmpp/core/session/debug/LogbackDebugger.java
diff --git a/juick-server-core/src/main/resources/juick.conf.example b/juick-common/src/main/resources/juick.conf.example
index f89ca82b..f89ca82b 100644
--- a/juick-server-core/src/main/resources/juick.conf.example
+++ b/juick-common/src/main/resources/juick.conf.example
diff --git a/juick-server-core/src/main/resources/juick.sql b/juick-common/src/main/resources/juick.sql
index 518c89ab..518c89ab 100644
--- a/juick-server-core/src/main/resources/juick.sql
+++ b/juick-common/src/main/resources/juick.sql
diff --git a/juick-server-core/src/main/resources/logback.xml.example b/juick-common/src/main/resources/logback.xml.example
index 05a3cfdf..05a3cfdf 100644
--- a/juick-server-core/src/main/resources/logback.xml.example
+++ b/juick-common/src/main/resources/logback.xml.example
diff --git a/juick-server-core/src/main/resources/pg_schema_wip b/juick-common/src/main/resources/pg_schema_wip
index f9470678..f9470678 100644
--- a/juick-server-core/src/main/resources/pg_schema_wip
+++ b/juick-common/src/main/resources/pg_schema_wip
diff --git a/juick-server-core/src/main/resources/update.sql b/juick-common/src/main/resources/update.sql
index 13a62c3d..13a62c3d 100644
--- a/juick-server-core/src/main/resources/update.sql
+++ b/juick-common/src/main/resources/update.sql
diff --git a/juick-core/src/test/java/com/juick/FormatterTest.java b/juick-common/src/test/java/com/juick/FormatterTest.java
index 397c4b6c..397c4b6c 100644
--- a/juick-core/src/test/java/com/juick/FormatterTest.java
+++ b/juick-common/src/test/java/com/juick/FormatterTest.java
diff --git a/juick-core/src/test/java/com/juick/MessageTest.java b/juick-common/src/test/java/com/juick/MessageTest.java
index 45c5730c..45c5730c 100644
--- a/juick-core/src/test/java/com/juick/MessageTest.java
+++ b/juick-common/src/test/java/com/juick/MessageTest.java
diff --git a/juick-core/src/test/java/com/juick/UserTest.java b/juick-common/src/test/java/com/juick/UserTest.java
index 13331426..13331426 100644
--- a/juick-core/src/test/java/com/juick/UserTest.java
+++ b/juick-common/src/test/java/com/juick/UserTest.java
diff --git a/juick-core/src/test/java/com/juick/test/util/MockUtils.java b/juick-common/src/test/java/com/juick/test/util/MockUtils.java
index 017af4d1..017af4d1 100644
--- a/juick-core/src/test/java/com/juick/test/util/MockUtils.java
+++ b/juick-common/src/test/java/com/juick/test/util/MockUtils.java
diff --git a/juick-core/build.gradle b/juick-core/build.gradle
deleted file mode 100644
index 431847a8..00000000
--- a/juick-core/build.gradle
+++ /dev/null
@@ -1,13 +0,0 @@
-dependencies {
-    compile("org.springframework.boot:spring-boot-starter-json")
-    compile 'org.apache.commons:commons-lang3:3.7'
-    compile "commons-codec:commons-codec:1.11"
-    compile 'org.apache.commons:commons-collections4:4.1'
-    compile "org.apache.commons:commons-text:1.2"
-    compile 'org.ocpsoft.prettytime:prettytime:4.0.1.Final'
-
-    compile 'com.google.code.findbugs:jsr305:3.0.2'
-
-    testCompile("org.springframework.boot:spring-boot-starter-test")
-    testCompile "rocks.xmpp:xmpp-core-client:0.7.5"
-}
diff --git a/juick-notifications/build.gradle b/juick-notifications/build.gradle
index 688111a6..a08d3c57 100644
--- a/juick-notifications/build.gradle
+++ b/juick-notifications/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 dependencies {
-    compile project(':juick-server-web')
+    compile project(':juick-common')
     compile 'com.ganyo:gcm-server:1.1.0'
     compile 'com.turo:pushy:0.12.0'
     testCompile("org.springframework.boot:spring-boot-starter-test")
diff --git a/juick-server-core/build.gradle b/juick-server-core/build.gradle
deleted file mode 100644
index 55d31c42..00000000
--- a/juick-server-core/build.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-apply plugin: 'war'
-
-sourceCompatibility = 1.8
-
-dependencies {
-    compile project(':juick-core')
-    providedCompile "org.apache.commons:commons-lang3:3.7"
-    providedCompile "org.apache.commons:commons-collections4:4.1"
-    providedCompile "commons-io:commons-io:2.6"
-
-    compile "rocks.xmpp:xmpp-core-client:0.7.5"
-    compile "rocks.xmpp:xmpp-extensions-client:0.7.5"
-
-    compile "javax.inject:javax.inject:1"
-    testCompile("org.springframework.boot:spring-boot-starter-test")
-}
diff --git a/juick-server-jdbc/build.gradle b/juick-server-jdbc/build.gradle
index 3db97bfa..5b323432 100644
--- a/juick-server-jdbc/build.gradle
+++ b/juick-server-jdbc/build.gradle
@@ -1,27 +1,15 @@
 apply plugin: 'java'
-apply plugin: 'io.spring.dependency-management'
-
-sourceCompatibility = 1.8
 
 dependencies {
-    compile project(':juick-server-core')
-
-    compile "org.apache.commons:commons-lang3:3.7"
-    compile "org.apache.commons:commons-collections4:4.1"
-
     compile("org.springframework.boot:spring-boot-starter-jdbc")
+    compile project(':juick-common')
 
     compile "org.apache.commons:commons-dbcp2:2.2.0"
     compile "com.googlecode.log4jdbc:log4jdbc:1.2"
-    compile "javax.inject:javax.inject:1"
 
-    compile 'org.imgscalr:imgscalr-lib:4.2'
-    compile 'com.h2database:h2:1.4.196'
     runtime 'mysql:mysql-connector-java:5.1.40'
 
-    runtime "commons-fileupload:commons-fileupload:1.3.3"
     testCompile("org.springframework.boot:spring-boot-starter-test")
-
-    testRuntime "mysql:mysql-connector-java:5.1.40"
+    testRuntime 'com.h2database:h2:1.4.196'
     testRuntime "org.postgresql:postgresql:42.2.2"
 }
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/CrosspostServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/CrosspostServiceImpl.java
index 3d0c9ba8..9f9d699f 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/CrosspostServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/CrosspostServiceImpl.java
@@ -22,11 +22,9 @@ import com.juick.server.helpers.ApplicationStatus;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.inject.Inject;
 import java.util.List;
 import java.util.Optional;
 
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
index 9c252f1f..87ab35f3 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
@@ -31,7 +31,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
@@ -39,12 +38,10 @@ import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
 
 import javax.inject.Inject;
 import java.sql.*;
 import java.time.Instant;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.Date;
 import java.util.stream.Collectors;
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/MessengerServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/MessengerServiceImpl.java
index 6118ac3d..57101ffe 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/MessengerServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/MessengerServiceImpl.java
@@ -2,11 +2,9 @@ package com.juick.service;
 
 import com.juick.User;
 import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.inject.Inject;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/PMQueriesServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/PMQueriesServiceImpl.java
index af3fa404..d42e375c 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/PMQueriesServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/PMQueriesServiceImpl.java
@@ -18,13 +18,11 @@
 package com.juick.service;
 
 import com.juick.User;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.inject.Inject;
 import java.util.List;
 
 /**
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java
index 53d1eb42..9f9cda1d 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/PrivacyQueriesServiceImpl.java
@@ -19,12 +19,9 @@ package com.juick.service;
 
 import com.juick.Tag;
 import com.juick.User;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.inject.Inject;
-
 /**
  * Created by aalexeev on 11/13/16.
  */
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/ShowQueriesServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/ShowQueriesServiceImpl.java
index 19ab08aa..e6d43710 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/ShowQueriesServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/ShowQueriesServiceImpl.java
@@ -18,12 +18,10 @@
 package com.juick.service;
 
 import com.juick.User;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.inject.Inject;
 import java.util.Collections;
 import java.util.List;
 
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/SubscriptionServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/SubscriptionServiceImpl.java
index 66b62833..eb3f79a9 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/SubscriptionServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/SubscriptionServiceImpl.java
@@ -22,7 +22,6 @@ import com.juick.User;
 import com.juick.server.helpers.NotifyOpts;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.dao.DuplicateKeyException;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/TagServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/TagServiceImpl.java
index 0f155b39..97627406 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/TagServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/TagServiceImpl.java
@@ -21,9 +21,7 @@ import com.juick.Tag;
 import com.juick.User;
 import com.juick.server.helpers.TagStats;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/TelegramServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/TelegramServiceImpl.java
index 9af85f0c..14cdfc8f 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/TelegramServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/TelegramServiceImpl.java
@@ -18,12 +18,10 @@
 package com.juick.service;
 
 import com.juick.User;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.inject.Inject;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
diff --git a/juick-server/build.gradle b/juick-server/build.gradle
index 3a60aad7..b0165fdc 100644
--- a/juick-server/build.gradle
+++ b/juick-server/build.gradle
@@ -1,16 +1,13 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-}
-
 apply plugin: 'war'
+apply plugin: 'org.springframework.boot'
 
 dependencies {
     compile project(':juick-server-jdbc')
-    compile project(':juick-server-web')
     compile ('org.springframework.boot:spring-boot-starter-security')
     providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
+    providedRuntime 'com.h2database:h2:1.4.196'
+
+    runtime "commons-fileupload:commons-fileupload:1.3.3"
 
     compile 'io.springfox:springfox-swagger2:2.8.0'
     compile 'io.springfox:springfox-swagger-ui:2.8.0'
@@ -25,10 +22,7 @@ dependencies {
     compile 'com.rometools:rome-modules:1.9.0'
 
     testCompile("org.springframework.boot:spring-boot-starter-test")
-    // https://mvnrepository.com/artifact/org.springframework.security/spring-security-test
-    testCompile group: 'org.springframework.security', name: 'spring-security-test', version: '5.0.3.RELEASE'
-
-
+    testCompile("org.springframework.security:spring-security-test")
     testRuntime 'com.jayway.jsonpath:json-path:2.4.0'
 }
 
diff --git a/juick-server/src/main/java/com/juick/server/EmailManager.java b/juick-server/src/main/java/com/juick/server/EmailManager.java
index 4c9bf3da..8dd7e06e 100644
--- a/juick-server/src/main/java/com/juick/server/EmailManager.java
+++ b/juick-server/src/main/java/com/juick/server/EmailManager.java
@@ -7,7 +7,6 @@ import com.juick.service.MessagesService;
 import com.juick.service.SubscriptionService;
 import com.juick.service.UserService;
 import com.juick.util.MessageUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationListener;
diff --git a/juick-server/src/main/java/com/juick/server/XMPPConnection.java b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
index 50c84bd6..91f66365 100644
--- a/juick-server/src/main/java/com/juick/server/XMPPConnection.java
+++ b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
@@ -17,7 +17,6 @@
 
 package com.juick.server;
 
-import com.juick.Attachment;
 import com.juick.User;
 import com.juick.server.xmpp.s2s.BasicXmppSession;
 import com.juick.server.helpers.UserInfo;
diff --git a/juick-server/src/main/java/com/juick/server/api/Messages.java b/juick-server/src/main/java/com/juick/server/api/Messages.java
index 769d1474..86426bf6 100644
--- a/juick-server/src/main/java/com/juick/server/api/Messages.java
+++ b/juick-server/src/main/java/com/juick/server/api/Messages.java
@@ -34,9 +34,6 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.inject.Inject;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.Collections;
 import java.util.List;
 
diff --git a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
index cd1af5a4..7d25a8ae 100644
--- a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
@@ -27,11 +27,8 @@ import com.juick.User;
 import com.juick.server.EmailManager;
 import com.juick.server.XMPPBot;
 import com.juick.server.XMPPServer;
-import com.juick.server.configuration.ApiAppConfiguration;
-import com.juick.server.configuration.ApiSecurityConfig;
 import com.juick.server.helpers.TagStats;
 import com.juick.service.*;
-import com.juick.service.security.NotAuthorizedAuthenticationEntryPoint;
 import com.juick.util.DateFormattersHolder;
 import org.junit.Before;
 import org.junit.Test;
@@ -41,15 +38,11 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
diff --git a/juick-www/build.gradle b/juick-www/build.gradle
index fb7f8131..407f3402 100644
--- a/juick-www/build.gradle
+++ b/juick-www/build.gradle
@@ -19,12 +19,17 @@ task compileFrontend(type: YarnTask) {
 }
 
 apply plugin: 'war'
+apply plugin: 'org.springframework.boot'
 
 dependencies {
-    compile project(':juick-server-web')
     compile project(':juick-server-jdbc')
+    compile 'com.github.ben-manes.caffeine:caffeine:2.6.2'
+    compile("org.springframework.boot:spring-boot-starter-cache")
     compile ('org.springframework.boot:spring-boot-starter-security')
     providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
+    providedRuntime 'com.h2database:h2:1.4.196'
+    runtime "commons-fileupload:commons-fileupload:1.3.3"
+
     compile 'com.github.scribejava:scribejava-apis:5.3.0'
     compile 'com.github.ooxi:serialized-php-parser:0.5.0'
     compile 'com.sun.mail:javax.mail:1.6.1'
diff --git a/juick-www/src/main/java/com/juick/service/CloudflareCache.java b/juick-www/src/main/java/com/juick/service/CloudflareCache.java
index 5046f692..64e048dc 100644
--- a/juick-www/src/main/java/com/juick/service/CloudflareCache.java
+++ b/juick-www/src/main/java/com/juick/service/CloudflareCache.java
@@ -14,7 +14,6 @@ import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import java.util.Arrays;
-import java.util.Collections;
 
 public class CloudflareCache implements ApplicationListener<UserUpdatedEvent> {
     private static final Logger logger = LoggerFactory.getLogger(CloudflareCache.class);
diff --git a/juick-www/src/main/java/com/juick/www/controllers/Messages.java b/juick-www/src/main/java/com/juick/www/controllers/Messages.java
index ea66e711..ce21f97d 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/Messages.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/Messages.java
@@ -43,12 +43,8 @@ import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.net.URLEncoder;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.BooleanSupplier;
 import java.util.stream.Collectors;
 
 /**
diff --git a/juick-www/src/main/java/com/juick/www/controllers/Settings.java b/juick-www/src/main/java/com/juick/www/controllers/Settings.java
index 141c9e2c..ffc66841 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/Settings.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/Settings.java
@@ -40,7 +40,6 @@ import javax.mail.Session;
 import javax.mail.Transport;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
-import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/juick-www/src/test/java/com/juick/www/WebAppTests.java b/juick-www/src/test/java/com/juick/www/WebAppTests.java
index 7aa0a515..8752a25e 100644
--- a/juick-www/src/test/java/com/juick/www/WebAppTests.java
+++ b/juick-www/src/test/java/com/juick/www/WebAppTests.java
@@ -37,7 +37,6 @@ import com.mitchellbosecke.pebble.PebbleEngine;
 import com.mitchellbosecke.pebble.error.PebbleException;
 import com.mitchellbosecke.pebble.template.PebbleTemplate;
 import org.apache.commons.text.StringEscapeUtils;
-import org.eclipse.jetty.websocket.common.message.MessageAppender;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -46,22 +45,15 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
-import org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.util.FileSystemUtils;
-import org.springframework.web.context.WebApplicationContext;
 
 import javax.inject.Inject;
 import javax.servlet.http.Cookie;
diff --git a/juick-xmpp-wip/build.gradle b/juick-xmpp-wip/build.gradle
index 4b63c2f7..aab1b995 100644
--- a/juick-xmpp-wip/build.gradle
+++ b/juick-xmpp-wip/build.gradle
@@ -1,5 +1,10 @@
+apply plugin: 'java'
+apply plugin: 'org.springframework.boot'
+apply plugin: 'war'
+
 dependencies {
     compile project(':juick-server-jdbc')
-    compile project(':juick-server-web')
+    runtime "commons-fileupload:commons-fileupload:1.3.3"
+    providedRuntime 'com.h2database:h2:1.4.196'
     testCompile("org.springframework.boot:spring-boot-starter-test")
 }
diff --git a/juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java b/juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java
index 72d9dfe9..f39913f8 100644
--- a/juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java
+++ b/juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java
@@ -23,7 +23,6 @@ import com.juick.configuration.DataConfiguration;
 import com.juick.service.ImagesService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.junit4.SpringRunner;
diff --git a/settings.gradle b/settings.gradle
index 1dc8f277..59ca2236 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
 rootProject.name = "Juick"
 
-include ':juick-core', ':juick-server-core', ':juick-server-jdbc', ':juick-server-web', ':juick-server', ':juick-www', ':juick-notifications', ':juick-xmpp-wip'
+include ':juick-common', ':juick-server-jdbc', ':juick-server', ':juick-www', ':juick-notifications', ':juick-xmpp-wip'
 
diff --git a/src/test/java/com/juick/rss/LegacyRSS.java b/src/test/java/com/juick/rss/LegacyRSS.java
index 3025b1f1..25e1de15 100644
--- a/src/test/java/com/juick/rss/LegacyRSS.java
+++ b/src/test/java/com/juick/rss/LegacyRSS.java
@@ -42,7 +42,7 @@ public class LegacyRSS {
 
     JdbcTemplate sql;
 
-    public void LegacyRSS(JdbcTemplate sql) {
+    public LegacyRSS(JdbcTemplate sql) {
         this.sql = sql;
     }