diff --git a/build.gradle b/build.gradle
index ad0702b..db469a9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,5 +5,9 @@ subprojects {
     repositories {
       mavenCentral()
     }
+
+    dependencies {
+        compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.3"
+    }
 }
 
diff --git a/core/build.gradle b/core/build.gradle
index 04b1869..55865f2 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -4,6 +4,5 @@ plugins {
 
 dependencies {
     compile 'com.moandjiezana.toml:toml4j:0.7.1'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.3"
     testCompile 'junit:junit:4.12'
 }
diff --git a/fx/build.gradle b/fx/build.gradle
index 9fbded4..555ee76 100644
--- a/fx/build.gradle
+++ b/fx/build.gradle
@@ -1,3 +1,6 @@
+plugins {
+  id 'org.jetbrains.kotlin.jvm' version '1.1.3'
+}
 apply plugin: 'application'
 
 dependencies {
diff --git a/core/src/main/kotlin/org/nwapw/abacus/fx/HistoryModel.kt b/fx/src/main/kotlin/org/nwapw/abacus/fx/HistoryModel.kt
similarity index 100%
rename from core/src/main/kotlin/org/nwapw/abacus/fx/HistoryModel.kt
rename to fx/src/main/kotlin/org/nwapw/abacus/fx/HistoryModel.kt
diff --git a/core/src/main/kotlin/org/nwapw/abacus/fx/ToggleablePlugin.kt b/fx/src/main/kotlin/org/nwapw/abacus/fx/ToggleablePlugin.kt
similarity index 100%
rename from core/src/main/kotlin/org/nwapw/abacus/fx/ToggleablePlugin.kt
rename to fx/src/main/kotlin/org/nwapw/abacus/fx/ToggleablePlugin.kt