diff --git a/app/build.gradle b/app/build.gradle
index 7b3fe324dc..41f1c21a8a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -171,10 +171,8 @@ dependencies {
 
     // in order to use internet's versions you'd need to enable Jetifier again
     // https://github.com/nightscout/graphview.git
-    implementation(files("${rootProject.rootDir}/libs/graphview.aar"))
     // https://github.com/nightscout/iconify.git
-    implementation(files("${rootProject.rootDir}/libs/iconify.aar"))
-
+    implementation project(':libraries')
     implementation project(':shared')
     implementation project(':core')
     implementation project(':automation')
diff --git a/automation/build.gradle b/automation/build.gradle
index 9d2099d443..552bc37408 100644
--- a/automation/build.gradle
+++ b/automation/build.gradle
@@ -13,8 +13,7 @@ android {
 }
 
 dependencies {
-    implementation(files("${rootProject.rootDir}/libs/graphview.aar"))
-
+    implementation project(':libraries')
     implementation project(':core')
     implementation project(':database')
     implementation project(':shared')
diff --git a/combo/build.gradle b/combo/build.gradle
index b76bc9ab23..4d81e1672a 100644
--- a/combo/build.gradle
+++ b/combo/build.gradle
@@ -13,8 +13,7 @@ android {
 }
 
 dependencies {
-    implementation(files("${rootProject.rootDir}/libs/iconify.aar"))
-
+    implementation project(':libraries')
     implementation project(':core')
     implementation project(':shared')
 }
\ No newline at end of file
diff --git a/core/build.gradle b/core/build.gradle
index 784e264e5d..dc9f6108da 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -12,8 +12,7 @@ apply from: "${project.rootDir}/core/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/jacoco_global.gradle"
 
 dependencies {
-    implementation(files("${rootProject.rootDir}/libs/graphview.aar"))
-
+    implementation project(':libraries')
     implementation project(':shared')
     implementation project(':database')
 }
diff --git a/dana/build.gradle b/dana/build.gradle
index 35f9454dab..4ca6452d9f 100644
--- a/dana/build.gradle
+++ b/dana/build.gradle
@@ -23,8 +23,7 @@ android {
 }
 
 dependencies {
-    implementation(files("${rootProject.rootDir}/libs/iconify.aar"))
-
+    implementation project(':libraries')
     implementation project(':core')
     implementation project(':shared')
 
diff --git a/diaconn/build.gradle b/diaconn/build.gradle
index 2c512646e3..137f787732 100644
--- a/diaconn/build.gradle
+++ b/diaconn/build.gradle
@@ -23,8 +23,7 @@ android {
 }
 
 dependencies {
-    implementation(files("${rootProject.rootDir}/libs/iconify.aar"))
-
+    implementation project(':libraries')
     implementation project(':core')
     implementation project(':shared')
 
diff --git a/libraries/.gitignore b/libraries/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/libraries/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/libraries/build.gradle b/libraries/build.gradle
new file mode 100644
index 0000000000..5d7e7997bb
--- /dev/null
+++ b/libraries/build.gradle
@@ -0,0 +1,6 @@
+// in order to use internet's versions you'd need to enable Jetifier again
+// https://github.com/nightscout/graphview.git
+// https://github.com/nightscout/iconify.git
+configurations.create("default")
+artifacts.add("default", file('libs/graphview.aar'))
+artifacts.add("default", file('libs/iconify.aar'))
\ No newline at end of file
diff --git a/libraries/consumer-rules.pro b/libraries/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/libs/graphview.aar b/libraries/libs/graphview.aar
similarity index 100%
rename from libs/graphview.aar
rename to libraries/libs/graphview.aar
diff --git a/libs/iconify.aar b/libraries/libs/iconify.aar
similarity index 100%
rename from libs/iconify.aar
rename to libraries/libs/iconify.aar
diff --git a/libraries/libs/libs/graphview.aar b/libraries/libs/libs/graphview.aar
new file mode 100644
index 0000000000..f3d0206cee
Binary files /dev/null and b/libraries/libs/libs/graphview.aar differ
diff --git a/libraries/libs/libs/iconify.aar b/libraries/libs/libs/iconify.aar
new file mode 100644
index 0000000000..1247bf7f92
Binary files /dev/null and b/libraries/libs/libs/iconify.aar differ
diff --git a/libs/ustwo-clockwise-debug.aar b/libraries/libs/libs/ustwo-clockwise-debug.aar
similarity index 100%
rename from libs/ustwo-clockwise-debug.aar
rename to libraries/libs/libs/ustwo-clockwise-debug.aar
diff --git a/libs/wearpreferenceactivity-0.5.0.aar b/libraries/libs/libs/wearpreferenceactivity-0.5.0.aar
similarity index 100%
rename from libs/wearpreferenceactivity-0.5.0.aar
rename to libraries/libs/libs/wearpreferenceactivity-0.5.0.aar
diff --git a/libraries/libs/ustwo-clockwise-debug.aar b/libraries/libs/ustwo-clockwise-debug.aar
new file mode 100644
index 0000000000..8257a991be
Binary files /dev/null and b/libraries/libs/ustwo-clockwise-debug.aar differ
diff --git a/libraries/libs/wearpreferenceactivity-0.5.0.aar b/libraries/libs/wearpreferenceactivity-0.5.0.aar
new file mode 100644
index 0000000000..66b3cad816
Binary files /dev/null and b/libraries/libs/wearpreferenceactivity-0.5.0.aar differ
diff --git a/libraries/proguard-rules.pro b/libraries/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/libraries/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/libraries/src/androidTest/java/info/nightscout/libraries/ExampleInstrumentedTest.kt b/libraries/src/androidTest/java/info/nightscout/libraries/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000000..56d07584b8
--- /dev/null
+++ b/libraries/src/androidTest/java/info/nightscout/libraries/ExampleInstrumentedTest.kt
@@ -0,0 +1,25 @@
+package info.nightscout.libraries
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("info.nightscout.libraries.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/libraries/src/main/AndroidManifest.xml b/libraries/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..a5918e68ab
--- /dev/null
+++ b/libraries/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/libraries/src/test/java/info/nightscout/libraries/ExampleUnitTest.kt b/libraries/src/test/java/info/nightscout/libraries/ExampleUnitTest.kt
new file mode 100644
index 0000000000..1f93248f94
--- /dev/null
+++ b/libraries/src/test/java/info/nightscout/libraries/ExampleUnitTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.libraries
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/medtronic/build.gradle b/medtronic/build.gradle
index 1f2fc0dcaf..525dd93b52 100644
--- a/medtronic/build.gradle
+++ b/medtronic/build.gradle
@@ -13,8 +13,7 @@ android {
 }
 
 dependencies {
-    implementation(files("${rootProject.rootDir}/libs/iconify.aar"))
-
+    implementation project(':libraries')
     implementation project(':core')
     implementation project(':pump-common')
     implementation project(':rileylink')
diff --git a/omnipod-common/build.gradle b/omnipod-common/build.gradle
index 84bd275697..83adbcfabc 100644
--- a/omnipod-common/build.gradle
+++ b/omnipod-common/build.gradle
@@ -14,8 +14,7 @@ android {
 }
 
 dependencies {
-    implementation(files("${rootProject.rootDir}/libs/iconify.aar"))
-
+    implementation project(':libraries')
     implementation project(':core')
     implementation project(':shared')
 }
\ No newline at end of file
diff --git a/omnipod-dash/build.gradle b/omnipod-dash/build.gradle
index d255a3b8e5..04d92e3880 100644
--- a/omnipod-dash/build.gradle
+++ b/omnipod-dash/build.gradle
@@ -30,8 +30,7 @@ android {
 }
 
 dependencies {
-    implementation(files("${rootProject.rootDir}/libs/iconify.aar"))
-
+    implementation project(':libraries')
     implementation project(':core')
     implementation project(':pump-common')
     implementation project(':omnipod-common')
diff --git a/omnipod-eros/build.gradle b/omnipod-eros/build.gradle
index a4975db071..5e5fa44f0f 100644
--- a/omnipod-eros/build.gradle
+++ b/omnipod-eros/build.gradle
@@ -23,8 +23,7 @@ android {
 }
 
 dependencies {
-    implementation(files("${rootProject.rootDir}/libs/iconify.aar"))
-
+    implementation project(':libraries')
     implementation project(':core')
     implementation project(':pump-common')
     implementation project(':omnipod-common')
diff --git a/settings.gradle b/settings.gradle
index 8411805772..4c3046732a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,4 +16,5 @@ include ':omnipod-eros'
 include ':omnipod-dash'
 include ':diaconn'
 include ':openhumans'
-include ':shared'
\ No newline at end of file
+include ':shared'
+include ':libraries'
diff --git a/wear/build.gradle b/wear/build.gradle
index e02bd28f66..60f43a20c3 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -107,8 +107,8 @@ dependencies {
     compileOnly "com.google.android.wearable:wearable:$wearable_version"
     implementation "com.google.android.support:wearable:$wearable_version"
     implementation "com.google.android.gms:play-services-wearable:$play_services_wearable_version"
-    implementation(files("${rootProject.rootDir}/libs/ustwo-clockwise-debug.aar"))
-    implementation(files("${rootProject.rootDir}/libs/wearpreferenceactivity-0.5.0.aar"))
+    implementation(files("${rootProject.rootDir}/libraries/libs/ustwo-clockwise-debug.aar"))
+    implementation(files("${rootProject.rootDir}/libraries/libs/wearpreferenceactivity-0.5.0.aar"))
     implementation('com.github.lecho:hellocharts-library:1.5.8@aar')
 
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"