diff --git a/amethyst/proguard-rules.pro b/amethyst/proguard-rules.pro
index c84569d50..830dc4248 100644
--- a/amethyst/proguard-rules.pro
+++ b/amethyst/proguard-rules.pro
@@ -61,7 +61,5 @@
 
 # JSON parsing
 -keep class com.vitorpamplona.quartz.** { *; }
--keep class com.vitorpamplona.amethyst.model.** { *; }
--keep class com.vitorpamplona.amethyst.service.** { *; }
--keep class com.vitorpamplona.ammolite.service.** { *; }
--keep class com.vitorpamplona.ammolite.relays.** { *; }
+-keep class com.vitorpamplona.amethyst.** { *; }
+-keep class com.vitorpamplona.ammolite.** { *; }
diff --git a/ammolite/consumer-rules.pro b/ammolite/consumer-rules.pro
index a98136082..fd7f2b7db 100644
--- a/ammolite/consumer-rules.pro
+++ b/ammolite/consumer-rules.pro
@@ -41,6 +41,4 @@
 # Keep All enums
 -keep enum ** { *; }
 
--keep class com.vitorpamplona.ammolite.service.** { *; }
--keep class com.vitorpamplona.ammolite.relays.** { *; }
--keep class com.vitorpamplona.ammolite.sockets.** { *; }
\ No newline at end of file
+-keep class com.vitorpamplona.ammolite.** { *; }
\ No newline at end of file
diff --git a/ammolite/proguard-rules.pro b/ammolite/proguard-rules.pro
index a98136082..fd7f2b7db 100644
--- a/ammolite/proguard-rules.pro
+++ b/ammolite/proguard-rules.pro
@@ -41,6 +41,4 @@
 # Keep All enums
 -keep enum ** { *; }
 
--keep class com.vitorpamplona.ammolite.service.** { *; }
--keep class com.vitorpamplona.ammolite.relays.** { *; }
--keep class com.vitorpamplona.ammolite.sockets.** { *; }
\ No newline at end of file
+-keep class com.vitorpamplona.ammolite.** { *; }
\ No newline at end of file