diff --git a/readropslibrary/.gitignore b/api/.gitignore
similarity index 100%
rename from readropslibrary/.gitignore
rename to api/.gitignore
diff --git a/readropslibrary/build.gradle b/api/build.gradle
similarity index 100%
rename from readropslibrary/build.gradle
rename to api/build.gradle
diff --git a/readropslibrary/proguard-rules.pro b/api/proguard-rules.pro
similarity index 100%
rename from readropslibrary/proguard-rules.pro
rename to api/proguard-rules.pro
diff --git a/readropslibrary/src/androidTest/java/com/readrops/readropslibrary/ExampleInstrumentedTest.java b/api/src/androidTest/java/com/readrops/api/ExampleInstrumentedTest.java
similarity index 94%
rename from readropslibrary/src/androidTest/java/com/readrops/readropslibrary/ExampleInstrumentedTest.java
rename to api/src/androidTest/java/com/readrops/api/ExampleInstrumentedTest.java
index d111c006..6e787bdf 100644
--- a/readropslibrary/src/androidTest/java/com/readrops/readropslibrary/ExampleInstrumentedTest.java
+++ b/api/src/androidTest/java/com/readrops/api/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary;
+package com.readrops.api;
 
 import android.content.Context;
 import androidx.test.InstrumentationRegistry;
diff --git a/readropslibrary/src/main/AndroidManifest.xml b/api/src/main/AndroidManifest.xml
similarity index 65%
rename from readropslibrary/src/main/AndroidManifest.xml
rename to api/src/main/AndroidManifest.xml
index 179b6028..b1075664 100644
--- a/readropslibrary/src/main/AndroidManifest.xml
+++ b/api/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.readrops.readropslibrary">
+    package="com.readrops.api">
 
 </manifest>
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/AFeed.kt b/api/src/main/java/com/readrops/api/localfeed/AFeed.kt
similarity index 77%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/AFeed.kt
rename to api/src/main/java/com/readrops/api/localfeed/AFeed.kt
index 7775c3d1..3cbd7653 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/AFeed.kt
+++ b/api/src/main/java/com/readrops/api/localfeed/AFeed.kt
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.localfeed
+package com.readrops.api.localfeed
 
 /*
  A simple class to give an abstract level to rss/atom/json feed classes
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSQuery.java b/api/src/main/java/com/readrops/api/localfeed/RSSQuery.java
similarity index 93%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSQuery.java
rename to api/src/main/java/com/readrops/api/localfeed/RSSQuery.java
index 40d52d20..75b8c8fc 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSQuery.java
+++ b/api/src/main/java/com/readrops/api/localfeed/RSSQuery.java
@@ -1,15 +1,15 @@
-package com.readrops.readropslibrary.localfeed;
+package com.readrops.api.localfeed;
 
 import android.accounts.NetworkErrorException;
 import android.util.Log;
 
-import com.readrops.readropslibrary.localfeed.atom.ATOMFeed;
-import com.readrops.readropslibrary.localfeed.json.JSONFeed;
-import com.readrops.readropslibrary.localfeed.rss.RSSFeed;
-import com.readrops.readropslibrary.localfeed.rss.RSSLink;
-import com.readrops.readropslibrary.utils.HttpManager;
-import com.readrops.readropslibrary.utils.LibUtils;
-import com.readrops.readropslibrary.utils.UnknownFormatException;
+import com.readrops.api.localfeed.atom.ATOMFeed;
+import com.readrops.api.localfeed.json.JSONFeed;
+import com.readrops.api.localfeed.rss.RSSFeed;
+import com.readrops.api.localfeed.rss.RSSLink;
+import com.readrops.api.utils.HttpManager;
+import com.readrops.api.utils.LibUtils;
+import com.readrops.api.utils.UnknownFormatException;
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
 
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSQueryResult.java b/api/src/main/java/com/readrops/api/localfeed/RSSQueryResult.java
similarity index 93%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSQueryResult.java
rename to api/src/main/java/com/readrops/api/localfeed/RSSQueryResult.java
index c2460ea2..449e162a 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSQueryResult.java
+++ b/api/src/main/java/com/readrops/api/localfeed/RSSQueryResult.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.localfeed;
+package com.readrops.api.localfeed;
 
 public class RSSQueryResult {
 
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/atom/ATOMAuthor.java b/api/src/main/java/com/readrops/api/localfeed/atom/ATOMAuthor.java
similarity index 87%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/atom/ATOMAuthor.java
rename to api/src/main/java/com/readrops/api/localfeed/atom/ATOMAuthor.java
index 62eab8c2..302d06c3 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/atom/ATOMAuthor.java
+++ b/api/src/main/java/com/readrops/api/localfeed/atom/ATOMAuthor.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.localfeed.atom;
+package com.readrops.api.localfeed.atom;
 
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/atom/ATOMEntry.java b/api/src/main/java/com/readrops/api/localfeed/atom/ATOMEntry.java
similarity index 97%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/atom/ATOMEntry.java
rename to api/src/main/java/com/readrops/api/localfeed/atom/ATOMEntry.java
index 4dc38a98..08671f1e 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/atom/ATOMEntry.java
+++ b/api/src/main/java/com/readrops/api/localfeed/atom/ATOMEntry.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.localfeed.atom;
+package com.readrops.api.localfeed.atom;
 
 import org.simpleframework.xml.Attribute;
 import org.simpleframework.xml.Element;
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/atom/ATOMFeed.java b/api/src/main/java/com/readrops/api/localfeed/atom/ATOMFeed.java
similarity index 95%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/atom/ATOMFeed.java
rename to api/src/main/java/com/readrops/api/localfeed/atom/ATOMFeed.java
index 66a126db..e83e3c1f 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/atom/ATOMFeed.java
+++ b/api/src/main/java/com/readrops/api/localfeed/atom/ATOMFeed.java
@@ -1,6 +1,6 @@
-package com.readrops.readropslibrary.localfeed.atom;
+package com.readrops.api.localfeed.atom;
 
-import com.readrops.readropslibrary.localfeed.AFeed;
+import com.readrops.api.localfeed.AFeed;
 
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.ElementList;
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/atom/ATOMLink.java b/api/src/main/java/com/readrops/api/localfeed/atom/ATOMLink.java
similarity index 91%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/atom/ATOMLink.java
rename to api/src/main/java/com/readrops/api/localfeed/atom/ATOMLink.java
index 7a155baa..024a137f 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/atom/ATOMLink.java
+++ b/api/src/main/java/com/readrops/api/localfeed/atom/ATOMLink.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.localfeed.atom;
+package com.readrops.api.localfeed.atom;
 
 import org.simpleframework.xml.Attribute;
 import org.simpleframework.xml.Root;
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/json/JSONAuthor.kt b/api/src/main/java/com/readrops/api/localfeed/json/JSONAuthor.kt
similarity index 81%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/json/JSONAuthor.kt
rename to api/src/main/java/com/readrops/api/localfeed/json/JSONAuthor.kt
index 02c4ed1a..125e69a1 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/json/JSONAuthor.kt
+++ b/api/src/main/java/com/readrops/api/localfeed/json/JSONAuthor.kt
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.localfeed.json
+package com.readrops.api.localfeed.json
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/json/JSONFeed.kt b/api/src/main/java/com/readrops/api/localfeed/json/JSONFeed.kt
similarity index 75%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/json/JSONFeed.kt
rename to api/src/main/java/com/readrops/api/localfeed/json/JSONFeed.kt
index b4233082..7d83d834 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/json/JSONFeed.kt
+++ b/api/src/main/java/com/readrops/api/localfeed/json/JSONFeed.kt
@@ -1,6 +1,6 @@
-package com.readrops.readropslibrary.localfeed.json
+package com.readrops.api.localfeed.json
 
-import com.readrops.readropslibrary.localfeed.AFeed
+import com.readrops.api.localfeed.AFeed
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/json/JSONItem.kt b/api/src/main/java/com/readrops/api/localfeed/json/JSONItem.kt
similarity index 93%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/json/JSONItem.kt
rename to api/src/main/java/com/readrops/api/localfeed/json/JSONItem.kt
index b6ea2c01..94e50b51 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/json/JSONItem.kt
+++ b/api/src/main/java/com/readrops/api/localfeed/json/JSONItem.kt
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.localfeed.json
+package com.readrops.api.localfeed.json
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSChannel.java b/api/src/main/java/com/readrops/api/localfeed/rss/RSSChannel.java
similarity index 97%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSChannel.java
rename to api/src/main/java/com/readrops/api/localfeed/rss/RSSChannel.java
index 53276540..32c88be3 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSChannel.java
+++ b/api/src/main/java/com/readrops/api/localfeed/rss/RSSChannel.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.localfeed.rss;
+package com.readrops.api.localfeed.rss;
 
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.ElementList;
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSEnclosure.java b/api/src/main/java/com/readrops/api/localfeed/rss/RSSEnclosure.java
similarity index 90%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSEnclosure.java
rename to api/src/main/java/com/readrops/api/localfeed/rss/RSSEnclosure.java
index 50fbc7dd..45a25dbd 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSEnclosure.java
+++ b/api/src/main/java/com/readrops/api/localfeed/rss/RSSEnclosure.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.localfeed.rss;
+package com.readrops.api.localfeed.rss;
 
 import org.simpleframework.xml.Attribute;
 import org.simpleframework.xml.Root;
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSFeed.java b/api/src/main/java/com/readrops/api/localfeed/rss/RSSFeed.java
similarity index 78%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSFeed.java
rename to api/src/main/java/com/readrops/api/localfeed/rss/RSSFeed.java
index 7afd88e9..e52ab253 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSFeed.java
+++ b/api/src/main/java/com/readrops/api/localfeed/rss/RSSFeed.java
@@ -1,6 +1,6 @@
-package com.readrops.readropslibrary.localfeed.rss;
+package com.readrops.api.localfeed.rss;
 
-import com.readrops.readropslibrary.localfeed.AFeed;
+import com.readrops.api.localfeed.AFeed;
 
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSItem.java b/api/src/main/java/com/readrops/api/localfeed/rss/RSSItem.java
similarity index 98%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSItem.java
rename to api/src/main/java/com/readrops/api/localfeed/rss/RSSItem.java
index 7ef5bcca..7cd15406 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSItem.java
+++ b/api/src/main/java/com/readrops/api/localfeed/rss/RSSItem.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.localfeed.rss;
+package com.readrops.api.localfeed.rss;
 
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.ElementList;
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSLink.java b/api/src/main/java/com/readrops/api/localfeed/rss/RSSLink.java
similarity index 88%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSLink.java
rename to api/src/main/java/com/readrops/api/localfeed/rss/RSSLink.java
index caf16fd1..e6511c33 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSLink.java
+++ b/api/src/main/java/com/readrops/api/localfeed/rss/RSSLink.java
@@ -1,7 +1,6 @@
-package com.readrops.readropslibrary.localfeed.rss;
+package com.readrops.api.localfeed.rss;
 
 import org.simpleframework.xml.Attribute;
-import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
 import org.simpleframework.xml.Text;
 
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSMediaContent.java b/api/src/main/java/com/readrops/api/localfeed/rss/RSSMediaContent.java
similarity index 91%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSMediaContent.java
rename to api/src/main/java/com/readrops/api/localfeed/rss/RSSMediaContent.java
index 1936212c..4e7c38e1 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSMediaContent.java
+++ b/api/src/main/java/com/readrops/api/localfeed/rss/RSSMediaContent.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.localfeed.rss;
+package com.readrops.api.localfeed.rss;
 
 import org.simpleframework.xml.Attribute;
 import org.simpleframework.xml.Root;
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/opml/OPMLParser.kt b/api/src/main/java/com/readrops/api/opml/OPMLParser.kt
similarity index 87%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/opml/OPMLParser.kt
rename to api/src/main/java/com/readrops/api/opml/OPMLParser.kt
index 2e0e0a38..d3dd9c82 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/opml/OPMLParser.kt
+++ b/api/src/main/java/com/readrops/api/opml/OPMLParser.kt
@@ -1,9 +1,9 @@
-package com.readrops.readropslibrary.opml
+package com.readrops.api.opml
 
 import android.content.Context
 import android.net.Uri
-import com.readrops.readropslibrary.opml.model.OPML
-import com.readrops.readropslibrary.utils.LibUtils
+import com.readrops.api.opml.model.OPML
+import com.readrops.api.utils.LibUtils
 import io.reactivex.Completable
 import io.reactivex.Single
 import org.simpleframework.xml.Serializer
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/opml/model/Body.kt b/api/src/main/java/com/readrops/api/opml/model/Body.kt
similarity index 86%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/opml/model/Body.kt
rename to api/src/main/java/com/readrops/api/opml/model/Body.kt
index a35b448f..43cf6e96 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/opml/model/Body.kt
+++ b/api/src/main/java/com/readrops/api/opml/model/Body.kt
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.opml.model
+package com.readrops.api.opml.model
 
 import org.simpleframework.xml.ElementList
 import org.simpleframework.xml.Root
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/opml/model/Head.kt b/api/src/main/java/com/readrops/api/opml/model/Head.kt
similarity index 85%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/opml/model/Head.kt
rename to api/src/main/java/com/readrops/api/opml/model/Head.kt
index dddbcc50..6d02b8b4 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/opml/model/Head.kt
+++ b/api/src/main/java/com/readrops/api/opml/model/Head.kt
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.opml.model
+package com.readrops.api.opml.model
 
 import org.simpleframework.xml.Element
 import org.simpleframework.xml.Root
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/opml/model/OPML.kt b/api/src/main/java/com/readrops/api/opml/model/OPML.kt
similarity index 91%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/opml/model/OPML.kt
rename to api/src/main/java/com/readrops/api/opml/model/OPML.kt
index b0a3fe58..cc6de1f9 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/opml/model/OPML.kt
+++ b/api/src/main/java/com/readrops/api/opml/model/OPML.kt
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.opml.model
+package com.readrops.api.opml.model
 
 import org.simpleframework.xml.Attribute
 import org.simpleframework.xml.Element
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/opml/model/Outline.kt b/api/src/main/java/com/readrops/api/opml/model/Outline.kt
similarity index 95%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/opml/model/Outline.kt
rename to api/src/main/java/com/readrops/api/opml/model/Outline.kt
index 7f580388..9a261069 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/opml/model/Outline.kt
+++ b/api/src/main/java/com/readrops/api/opml/model/Outline.kt
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.opml.model
+package com.readrops.api.opml.model
 
 import org.simpleframework.xml.Attribute
 import org.simpleframework.xml.ElementList
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/API.java b/api/src/main/java/com/readrops/api/services/API.java
similarity index 94%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/API.java
rename to api/src/main/java/com/readrops/api/services/API.java
index aa4aaaa8..d86e938a 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/API.java
+++ b/api/src/main/java/com/readrops/api/services/API.java
@@ -1,8 +1,8 @@
-package com.readrops.readropslibrary.services;
+package com.readrops.api.services;
 
 import androidx.annotation.NonNull;
 
-import com.readrops.readropslibrary.utils.HttpManager;
+import com.readrops.api.utils.HttpManager;
 import com.squareup.moshi.Moshi;
 
 import retrofit2.Retrofit;
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/Credentials.java b/api/src/main/java/com/readrops/api/services/Credentials.java
similarity index 81%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/Credentials.java
rename to api/src/main/java/com/readrops/api/services/Credentials.java
index 09cb50b1..c00d536d 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/Credentials.java
+++ b/api/src/main/java/com/readrops/api/services/Credentials.java
@@ -1,10 +1,10 @@
-package com.readrops.readropslibrary.services;
+package com.readrops.api.services;
 
 import androidx.annotation.Nullable;
 
 import com.readrops.readropsdb.entities.account.Account;
-import com.readrops.readropslibrary.services.freshrss.FreshRSSCredentials;
-import com.readrops.readropslibrary.services.nextcloudnews.NextNewsCredentials;
+import com.readrops.api.services.freshrss.FreshRSSCredentials;
+import com.readrops.api.services.nextcloudnews.NextNewsCredentials;
 
 public abstract class Credentials {
 
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/SyncResult.kt b/api/src/main/java/com/readrops/api/services/SyncResult.kt
similarity index 87%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/SyncResult.kt
rename to api/src/main/java/com/readrops/api/services/SyncResult.kt
index 22ecde07..7cae8f46 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/SyncResult.kt
+++ b/api/src/main/java/com/readrops/api/services/SyncResult.kt
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.services
+package com.readrops.api.services
 
 import com.readrops.readropsdb.entities.Feed
 import com.readrops.readropsdb.entities.Folder
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/SyncType.java b/api/src/main/java/com/readrops/api/services/SyncType.java
similarity index 56%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/SyncType.java
rename to api/src/main/java/com/readrops/api/services/SyncType.java
index 9dda7d0a..efbb274e 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/SyncType.java
+++ b/api/src/main/java/com/readrops/api/services/SyncType.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.services;
+package com.readrops.api.services;
 
 public enum SyncType {
     INITIAL_SYNC,
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSAPI.java b/api/src/main/java/com/readrops/api/services/freshrss/FreshRSSAPI.java
similarity index 93%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSAPI.java
rename to api/src/main/java/com/readrops/api/services/freshrss/FreshRSSAPI.java
index 551251e7..b79bb71f 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSAPI.java
+++ b/api/src/main/java/com/readrops/api/services/freshrss/FreshRSSAPI.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.services.freshrss;
+package com.readrops.api.services.freshrss;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -6,14 +6,14 @@ import androidx.annotation.Nullable;
 import com.readrops.readropsdb.entities.Feed;
 import com.readrops.readropsdb.entities.Folder;
 import com.readrops.readropsdb.entities.Item;
-import com.readrops.readropslibrary.services.API;
-import com.readrops.readropslibrary.services.Credentials;
-import com.readrops.readropslibrary.services.SyncResult;
-import com.readrops.readropslibrary.services.SyncType;
-import com.readrops.readropslibrary.services.freshrss.adapters.FreshRSSFeedsAdapter;
-import com.readrops.readropslibrary.services.freshrss.adapters.FreshRSSFoldersAdapter;
-import com.readrops.readropslibrary.services.freshrss.adapters.FreshRSSItemsAdapter;
-import com.readrops.readropslibrary.services.freshrss.json.FreshRSSUserInfo;
+import com.readrops.api.services.API;
+import com.readrops.api.services.Credentials;
+import com.readrops.api.services.SyncResult;
+import com.readrops.api.services.SyncType;
+import com.readrops.api.services.freshrss.adapters.FreshRSSFeedsAdapter;
+import com.readrops.api.services.freshrss.adapters.FreshRSSFoldersAdapter;
+import com.readrops.api.services.freshrss.adapters.FreshRSSItemsAdapter;
+import com.readrops.api.services.freshrss.json.FreshRSSUserInfo;
 import com.squareup.moshi.Moshi;
 import com.squareup.moshi.Types;
 
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSCredentials.java b/api/src/main/java/com/readrops/api/services/freshrss/FreshRSSCredentials.java
similarity index 69%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSCredentials.java
rename to api/src/main/java/com/readrops/api/services/freshrss/FreshRSSCredentials.java
index e05b1522..0ad89f45 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSCredentials.java
+++ b/api/src/main/java/com/readrops/api/services/freshrss/FreshRSSCredentials.java
@@ -1,6 +1,6 @@
-package com.readrops.readropslibrary.services.freshrss;
+package com.readrops.api.services.freshrss;
 
-import com.readrops.readropslibrary.services.Credentials;
+import com.readrops.api.services.Credentials;
 
 public class FreshRSSCredentials extends Credentials {
 
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSService.java b/api/src/main/java/com/readrops/api/services/freshrss/FreshRSSService.java
similarity index 94%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSService.java
rename to api/src/main/java/com/readrops/api/services/freshrss/FreshRSSService.java
index b49ce94c..424adb9b 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSService.java
+++ b/api/src/main/java/com/readrops/api/services/freshrss/FreshRSSService.java
@@ -1,9 +1,9 @@
-package com.readrops.readropslibrary.services.freshrss;
+package com.readrops.api.services.freshrss;
 
 import com.readrops.readropsdb.entities.Feed;
 import com.readrops.readropsdb.entities.Folder;
 import com.readrops.readropsdb.entities.Item;
-import com.readrops.readropslibrary.services.freshrss.json.FreshRSSUserInfo;
+import com.readrops.api.services.freshrss.json.FreshRSSUserInfo;
 
 import java.util.List;
 
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSSyncData.java b/api/src/main/java/com/readrops/api/services/freshrss/FreshRSSSyncData.java
similarity index 94%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSSyncData.java
rename to api/src/main/java/com/readrops/api/services/freshrss/FreshRSSSyncData.java
index aa26b1d6..072b11bf 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSSyncData.java
+++ b/api/src/main/java/com/readrops/api/services/freshrss/FreshRSSSyncData.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.services.freshrss;
+package com.readrops.api.services.freshrss;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/adapters/FreshRSSFeedsAdapter.kt b/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFeedsAdapter.kt
similarity index 96%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/adapters/FreshRSSFeedsAdapter.kt
rename to api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFeedsAdapter.kt
index 33bfb0be..c64f151e 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/adapters/FreshRSSFeedsAdapter.kt
+++ b/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFeedsAdapter.kt
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.services.freshrss.adapters
+package com.readrops.api.services.freshrss.adapters
 
 import android.annotation.SuppressLint
 import com.readrops.readropsdb.entities.Feed
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/adapters/FreshRSSFoldersAdapter.kt b/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFoldersAdapter.kt
similarity index 96%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/adapters/FreshRSSFoldersAdapter.kt
rename to api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFoldersAdapter.kt
index 00a0c604..76fa0780 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/adapters/FreshRSSFoldersAdapter.kt
+++ b/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFoldersAdapter.kt
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.services.freshrss.adapters
+package com.readrops.api.services.freshrss.adapters
 
 import android.annotation.SuppressLint
 import com.readrops.readropsdb.entities.Folder
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/adapters/FreshRSSItemsAdapter.kt b/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSItemsAdapter.kt
similarity index 96%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/adapters/FreshRSSItemsAdapter.kt
rename to api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSItemsAdapter.kt
index dea23744..ccd89154 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/adapters/FreshRSSItemsAdapter.kt
+++ b/api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSItemsAdapter.kt
@@ -1,8 +1,8 @@
-package com.readrops.readropslibrary.services.freshrss.adapters
+package com.readrops.api.services.freshrss.adapters
 
 import android.util.TimingLogger
 import com.readrops.readropsdb.entities.Item
-import com.readrops.readropslibrary.services.freshrss.FreshRSSAPI.GOOGLE_READ
+import com.readrops.api.services.freshrss.FreshRSSAPI.GOOGLE_READ
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/json/FreshRSSUserInfo.kt b/api/src/main/java/com/readrops/api/services/freshrss/json/FreshRSSUserInfo.kt
similarity index 66%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/json/FreshRSSUserInfo.kt
rename to api/src/main/java/com/readrops/api/services/freshrss/json/FreshRSSUserInfo.kt
index cce6ec34..5362f5cd 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/json/FreshRSSUserInfo.kt
+++ b/api/src/main/java/com/readrops/api/services/freshrss/json/FreshRSSUserInfo.kt
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.services.freshrss.json
+package com.readrops.api.services.freshrss.json
 
 import com.squareup.moshi.JsonClass
 
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/NextNewsAPI.java b/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsAPI.java
similarity index 91%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/NextNewsAPI.java
rename to api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsAPI.java
index b8c62d5a..2a40a2d8 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/NextNewsAPI.java
+++ b/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsAPI.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.services.nextcloudnews;
+package com.readrops.api.services.nextcloudnews;
 
 import android.content.res.Resources;
 
@@ -8,17 +8,17 @@ import androidx.annotation.Nullable;
 import com.readrops.readropsdb.entities.Feed;
 import com.readrops.readropsdb.entities.Folder;
 import com.readrops.readropsdb.entities.Item;
-import com.readrops.readropslibrary.services.API;
-import com.readrops.readropslibrary.services.Credentials;
-import com.readrops.readropslibrary.services.SyncResult;
-import com.readrops.readropslibrary.services.SyncType;
-import com.readrops.readropslibrary.services.nextcloudnews.adapters.NextNewsFeedsAdapter;
-import com.readrops.readropslibrary.services.nextcloudnews.adapters.NextNewsFoldersAdapter;
-import com.readrops.readropslibrary.services.nextcloudnews.adapters.NextNewsItemsAdapter;
-import com.readrops.readropslibrary.services.nextcloudnews.json.NextNewsUser;
-import com.readrops.readropslibrary.utils.ConflictException;
-import com.readrops.readropslibrary.utils.LibUtils;
-import com.readrops.readropslibrary.utils.UnknownFormatException;
+import com.readrops.api.services.API;
+import com.readrops.api.services.Credentials;
+import com.readrops.api.services.SyncResult;
+import com.readrops.api.services.SyncType;
+import com.readrops.api.services.nextcloudnews.adapters.NextNewsFeedsAdapter;
+import com.readrops.api.services.nextcloudnews.adapters.NextNewsFoldersAdapter;
+import com.readrops.api.services.nextcloudnews.adapters.NextNewsItemsAdapter;
+import com.readrops.api.services.nextcloudnews.json.NextNewsUser;
+import com.readrops.api.utils.ConflictException;
+import com.readrops.api.utils.LibUtils;
+import com.readrops.api.utils.UnknownFormatException;
 import com.squareup.moshi.Moshi;
 import com.squareup.moshi.Types;
 
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/NextNewsCredentials.java b/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsCredentials.java
similarity index 63%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/NextNewsCredentials.java
rename to api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsCredentials.java
index d573dca9..40644621 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/NextNewsCredentials.java
+++ b/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsCredentials.java
@@ -1,6 +1,6 @@
-package com.readrops.readropslibrary.services.nextcloudnews;
+package com.readrops.api.services.nextcloudnews;
 
-import com.readrops.readropslibrary.services.Credentials;
+import com.readrops.api.services.Credentials;
 
 public class NextNewsCredentials extends Credentials {
 
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/NextNewsService.java b/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsService.java
similarity index 93%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/NextNewsService.java
rename to api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsService.java
index 54d78ca9..f8b3af96 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/NextNewsService.java
+++ b/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsService.java
@@ -1,9 +1,9 @@
-package com.readrops.readropslibrary.services.nextcloudnews;
+package com.readrops.api.services.nextcloudnews;
 
 import com.readrops.readropsdb.entities.Feed;
 import com.readrops.readropsdb.entities.Folder;
 import com.readrops.readropsdb.entities.Item;
-import com.readrops.readropslibrary.services.nextcloudnews.json.NextNewsUser;
+import com.readrops.api.services.nextcloudnews.json.NextNewsUser;
 
 import java.util.List;
 import java.util.Map;
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/NextNewsSyncData.java b/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsSyncData.java
similarity index 95%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/NextNewsSyncData.java
rename to api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsSyncData.java
index 258afe47..cc1fc8ba 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/NextNewsSyncData.java
+++ b/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsSyncData.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.services.nextcloudnews;
+package com.readrops.api.services.nextcloudnews;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt b/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt
similarity index 93%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt
rename to api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt
index f15d0c26..28a9ea73 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt
+++ b/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt
@@ -1,8 +1,8 @@
-package com.readrops.readropslibrary.services.nextcloudnews.adapters
+package com.readrops.api.services.nextcloudnews.adapters
 
 import android.annotation.SuppressLint
 import com.readrops.readropsdb.entities.Feed
-import com.readrops.readropslibrary.utils.nextNullableString
+import com.readrops.api.utils.nextNullableString
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonReader
 import com.squareup.moshi.ToJson
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/adapters/NextNewsFoldersAdapter.kt b/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFoldersAdapter.kt
similarity index 94%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/adapters/NextNewsFoldersAdapter.kt
rename to api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFoldersAdapter.kt
index 0c6cc2d5..fe77a2ef 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/adapters/NextNewsFoldersAdapter.kt
+++ b/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFoldersAdapter.kt
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.services.nextcloudnews.adapters
+package com.readrops.api.services.nextcloudnews.adapters
 
 import android.annotation.SuppressLint
 import com.readrops.readropsdb.entities.Folder
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt b/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt
similarity index 92%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt
rename to api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt
index 97188e93..0c43dbee 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt
+++ b/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt
@@ -1,9 +1,9 @@
-package com.readrops.readropslibrary.services.nextcloudnews.adapters
+package com.readrops.api.services.nextcloudnews.adapters
 
 import android.annotation.SuppressLint
 import com.readrops.readropsdb.entities.Item
-import com.readrops.readropslibrary.utils.LibUtils
-import com.readrops.readropslibrary.utils.nextNullableString
+import com.readrops.api.utils.LibUtils
+import com.readrops.api.utils.nextNullableString
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/json/NextNewsUser.kt b/api/src/main/java/com/readrops/api/services/nextcloudnews/json/NextNewsUser.kt
similarity index 85%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/json/NextNewsUser.kt
rename to api/src/main/java/com/readrops/api/services/nextcloudnews/json/NextNewsUser.kt
index adc26552..bc50ae6f 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/json/NextNewsUser.kt
+++ b/api/src/main/java/com/readrops/api/services/nextcloudnews/json/NextNewsUser.kt
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.services.nextcloudnews.json
+package com.readrops.api.services.nextcloudnews.json
 
 import com.squareup.moshi.JsonClass
 
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/ConflictException.java b/api/src/main/java/com/readrops/api/utils/ConflictException.java
similarity index 79%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/utils/ConflictException.java
rename to api/src/main/java/com/readrops/api/utils/ConflictException.java
index fea4a31d..83467a44 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/ConflictException.java
+++ b/api/src/main/java/com/readrops/api/utils/ConflictException.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.utils;
+package com.readrops.api.utils;
 
 public class ConflictException extends Exception {
 
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/HttpManager.java b/api/src/main/java/com/readrops/api/utils/HttpManager.java
similarity index 94%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/utils/HttpManager.java
rename to api/src/main/java/com/readrops/api/utils/HttpManager.java
index 2a9bde36..0f4605e0 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/HttpManager.java
+++ b/api/src/main/java/com/readrops/api/utils/HttpManager.java
@@ -1,8 +1,8 @@
-package com.readrops.readropslibrary.utils;
+package com.readrops.api.utils;
 
 import androidx.annotation.Nullable;
 
-import com.readrops.readropslibrary.services.Credentials;
+import com.readrops.api.services.Credentials;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/JsonReaderExtensions.kt b/api/src/main/java/com/readrops/api/utils/JsonReaderExtensions.kt
similarity index 74%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/utils/JsonReaderExtensions.kt
rename to api/src/main/java/com/readrops/api/utils/JsonReaderExtensions.kt
index 15d46bc0..ae8e4bde 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/JsonReaderExtensions.kt
+++ b/api/src/main/java/com/readrops/api/utils/JsonReaderExtensions.kt
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.utils
+package com.readrops.api.utils
 
 import com.squareup.moshi.JsonReader
 
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/LibUtils.java b/api/src/main/java/com/readrops/api/utils/LibUtils.java
similarity index 97%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/utils/LibUtils.java
rename to api/src/main/java/com/readrops/api/utils/LibUtils.java
index d34f1483..d838e68e 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/LibUtils.java
+++ b/api/src/main/java/com/readrops/api/utils/LibUtils.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.utils;
+package com.readrops.api.utils;
 
 import android.content.Context;
 import android.net.Uri;
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/ParseException.java b/api/src/main/java/com/readrops/api/utils/ParseException.java
similarity index 54%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/utils/ParseException.java
rename to api/src/main/java/com/readrops/api/utils/ParseException.java
index 67d60f1e..12db280c 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/ParseException.java
+++ b/api/src/main/java/com/readrops/api/utils/ParseException.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.utils;
+package com.readrops.api.utils;
 
 public class ParseException extends Exception {
 
diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/UnknownFormatException.java b/api/src/main/java/com/readrops/api/utils/UnknownFormatException.java
similarity index 81%
rename from readropslibrary/src/main/java/com/readrops/readropslibrary/utils/UnknownFormatException.java
rename to api/src/main/java/com/readrops/api/utils/UnknownFormatException.java
index 55e65399..3e76fe56 100644
--- a/readropslibrary/src/main/java/com/readrops/readropslibrary/utils/UnknownFormatException.java
+++ b/api/src/main/java/com/readrops/api/utils/UnknownFormatException.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary.utils;
+package com.readrops.api.utils;
 
 public class UnknownFormatException extends Exception {
 
diff --git a/readropslibrary/src/main/res/values/strings.xml b/api/src/main/res/values/strings.xml
similarity index 100%
rename from readropslibrary/src/main/res/values/strings.xml
rename to api/src/main/res/values/strings.xml
diff --git a/readropslibrary/src/test/java/com/readrops/readropslibrary/ExampleUnitTest.java b/api/src/test/java/com/readrops/api/ExampleUnitTest.java
similarity index 89%
rename from readropslibrary/src/test/java/com/readrops/readropslibrary/ExampleUnitTest.java
rename to api/src/test/java/com/readrops/api/ExampleUnitTest.java
index 70efda29..79e5f257 100644
--- a/readropslibrary/src/test/java/com/readrops/readropslibrary/ExampleUnitTest.java
+++ b/api/src/test/java/com/readrops/api/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.readrops.readropslibrary;
+package com.readrops.api;
 
 import org.junit.Test;
 
diff --git a/app/build.gradle b/app/build.gradle
index 75adf997..e1845dc5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,7 +53,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation project(':readropslibrary')
+    implementation project(':api')
     implementation project(':readropsdb')
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 20886072..77345f4c 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -26,9 +26,9 @@
 
 -keep class org.simpleframework.xml.** { *; }
 
--keep class com.readrops.readropslibrary.services.freshrss.json.** { *; }
--keep class com.readrops.readropslibrary.services.nextcloudnews.json.** { *; }
+-keep class com.readrops.api.services.freshrss.json.** { *; }
+-keep class com.readrops.api.services.nextcloudnews.json.** { *; }
 
--keep class com.readrops.readropslibrary.localfeed.** { *; }
+-keep class com.readrops.api.localfeed.** { *; }
 
--keep class com.readrops.readropslibrary.opml.model.** { *; }
\ No newline at end of file
+-keep class com.readrops.api.opml.model.** { *; }
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/readrops/app/SyncResultAnalyserTest.kt b/app/src/androidTest/java/com/readrops/app/SyncResultAnalyserTest.kt
index ab555e68..eaf63d53 100644
--- a/app/src/androidTest/java/com/readrops/app/SyncResultAnalyserTest.kt
+++ b/app/src/androidTest/java/com/readrops/app/SyncResultAnalyserTest.kt
@@ -10,7 +10,7 @@ import com.readrops.readropsdb.entities.Feed
 import com.readrops.readropsdb.entities.Item
 import com.readrops.readropsdb.entities.account.Account
 import com.readrops.readropsdb.entities.account.AccountType
-import com.readrops.readropslibrary.services.SyncResult
+import com.readrops.api.services.SyncResult
 import org.joda.time.LocalDateTime
 import org.junit.After
 import org.junit.Assert.assertEquals
diff --git a/app/src/debug/java/com/readrops/app/ReadropsDebugApp.java b/app/src/debug/java/com/readrops/app/ReadropsDebugApp.java
index 908531f1..9e09bd2e 100644
--- a/app/src/debug/java/com/readrops/app/ReadropsDebugApp.java
+++ b/app/src/debug/java/com/readrops/app/ReadropsDebugApp.java
@@ -19,7 +19,7 @@ import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPl
 import com.facebook.soloader.SoLoader;
 import com.icapps.niddler.core.AndroidNiddler;
 import com.icapps.niddler.interceptor.okhttp.NiddlerOkHttpInterceptor;
-import com.readrops.readropslibrary.utils.HttpManager;
+import com.readrops.api.utils.HttpManager;
 
 public class ReadropsDebugApp extends ReadropsApp implements Configuration.Provider {
 
diff --git a/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java b/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java
index 4ff87b0c..498a2aa8 100644
--- a/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java
+++ b/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java
@@ -20,8 +20,8 @@ import com.readrops.app.utils.Utils;
 import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel;
 import com.readrops.readropsdb.entities.Folder;
 import com.readrops.readropsdb.entities.account.Account;
-import com.readrops.readropslibrary.utils.ConflictException;
-import com.readrops.readropslibrary.utils.UnknownFormatException;
+import com.readrops.api.utils.ConflictException;
+import com.readrops.api.utils.UnknownFormatException;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
diff --git a/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java b/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java
index b4b66d43..3e9827fd 100644
--- a/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java
+++ b/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java
@@ -22,8 +22,8 @@ import com.readrops.app.utils.Utils;
 import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel;
 import com.readrops.readropsdb.entities.Folder;
 import com.readrops.readropsdb.entities.account.Account;
-import com.readrops.readropslibrary.utils.ConflictException;
-import com.readrops.readropslibrary.utils.UnknownFormatException;
+import com.readrops.api.utils.ConflictException;
+import com.readrops.api.utils.UnknownFormatException;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.observers.DisposableSingleObserver;
diff --git a/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java b/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java
index 67b5571c..745c80ac 100644
--- a/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java
+++ b/app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java
@@ -34,8 +34,8 @@ import com.readrops.app.utils.matchers.OPMLMatcher;
 import com.readrops.app.viewmodels.AccountViewModel;
 import com.readrops.readropsdb.entities.account.Account;
 import com.readrops.readropsdb.entities.account.AccountType;
-import com.readrops.readropslibrary.opml.OPMLParser;
-import com.readrops.readropslibrary.opml.model.OPML;
+import com.readrops.api.opml.OPMLParser;
+import com.readrops.api.opml.model.OPML;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/app/src/main/java/com/readrops/app/repositories/ARepository.java b/app/src/main/java/com/readrops/app/repositories/ARepository.java
index d29c6572..d6ce25d9 100644
--- a/app/src/main/java/com/readrops/app/repositories/ARepository.java
+++ b/app/src/main/java/com/readrops/app/repositories/ARepository.java
@@ -16,7 +16,7 @@ import com.readrops.readropsdb.entities.Folder;
 import com.readrops.readropsdb.entities.Item;
 import com.readrops.readropsdb.entities.account.Account;
 import com.readrops.readropsdb.entities.account.AccountType;
-import com.readrops.readropslibrary.services.SyncResult;
+import com.readrops.api.services.SyncResult;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java b/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java
index 1419563d..1980bad8 100644
--- a/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java
+++ b/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java
@@ -14,11 +14,11 @@ import com.readrops.readropsdb.entities.Feed;
 import com.readrops.readropsdb.entities.Folder;
 import com.readrops.readropsdb.entities.Item;
 import com.readrops.readropsdb.entities.account.Account;
-import com.readrops.readropslibrary.services.Credentials;
-import com.readrops.readropslibrary.services.SyncType;
-import com.readrops.readropslibrary.services.freshrss.FreshRSSAPI;
-import com.readrops.readropslibrary.services.freshrss.FreshRSSCredentials;
-import com.readrops.readropslibrary.services.freshrss.FreshRSSSyncData;
+import com.readrops.api.services.Credentials;
+import com.readrops.api.services.SyncType;
+import com.readrops.api.services.freshrss.FreshRSSAPI;
+import com.readrops.api.services.freshrss.FreshRSSCredentials;
+import com.readrops.api.services.freshrss.FreshRSSSyncData;
 
 import org.joda.time.DateTime;
 
diff --git a/app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java b/app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java
index 671ba0ac..ab2fded6 100644
--- a/app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java
+++ b/app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java
@@ -16,16 +16,16 @@ import com.readrops.app.utils.matchers.ItemMatcher;
 import com.readrops.readropsdb.entities.Feed;
 import com.readrops.readropsdb.entities.Item;
 import com.readrops.readropsdb.entities.account.Account;
-import com.readrops.readropslibrary.localfeed.AFeed;
-import com.readrops.readropslibrary.localfeed.RSSQuery;
-import com.readrops.readropslibrary.localfeed.RSSQueryResult;
-import com.readrops.readropslibrary.localfeed.atom.ATOMFeed;
-import com.readrops.readropslibrary.localfeed.json.JSONFeed;
-import com.readrops.readropslibrary.localfeed.rss.RSSFeed;
-import com.readrops.readropslibrary.services.SyncResult;
-import com.readrops.readropslibrary.utils.LibUtils;
-import com.readrops.readropslibrary.utils.ParseException;
-import com.readrops.readropslibrary.utils.UnknownFormatException;
+import com.readrops.api.localfeed.AFeed;
+import com.readrops.api.localfeed.RSSQuery;
+import com.readrops.api.localfeed.RSSQueryResult;
+import com.readrops.api.localfeed.atom.ATOMFeed;
+import com.readrops.api.localfeed.json.JSONFeed;
+import com.readrops.api.localfeed.rss.RSSFeed;
+import com.readrops.api.services.SyncResult;
+import com.readrops.api.utils.LibUtils;
+import com.readrops.api.utils.ParseException;
+import com.readrops.api.utils.UnknownFormatException;
 
 import org.jsoup.Jsoup;
 
diff --git a/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java b/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java
index 93b0101a..af564ae4 100644
--- a/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java
+++ b/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java
@@ -14,13 +14,13 @@ import com.readrops.readropsdb.entities.Feed;
 import com.readrops.readropsdb.entities.Folder;
 import com.readrops.readropsdb.entities.Item;
 import com.readrops.readropsdb.entities.account.Account;
-import com.readrops.readropslibrary.services.Credentials;
-import com.readrops.readropslibrary.services.SyncResult;
-import com.readrops.readropslibrary.services.SyncType;
-import com.readrops.readropslibrary.services.nextcloudnews.NextNewsAPI;
-import com.readrops.readropslibrary.services.nextcloudnews.NextNewsSyncData;
-import com.readrops.readropslibrary.services.nextcloudnews.json.NextNewsUser;
-import com.readrops.readropslibrary.utils.UnknownFormatException;
+import com.readrops.api.services.Credentials;
+import com.readrops.api.services.SyncResult;
+import com.readrops.api.services.SyncType;
+import com.readrops.api.services.nextcloudnews.NextNewsAPI;
+import com.readrops.api.services.nextcloudnews.NextNewsSyncData;
+import com.readrops.api.services.nextcloudnews.json.NextNewsUser;
+import com.readrops.api.utils.UnknownFormatException;
 
 import org.joda.time.LocalDateTime;
 
diff --git a/app/src/main/java/com/readrops/app/utils/HtmlParser.java b/app/src/main/java/com/readrops/app/utils/HtmlParser.java
index f0414d0d..c1f5b7d2 100644
--- a/app/src/main/java/com/readrops/app/utils/HtmlParser.java
+++ b/app/src/main/java/com/readrops/app/utils/HtmlParser.java
@@ -5,8 +5,8 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.readrops.readropslibrary.utils.HttpManager;
-import com.readrops.readropslibrary.utils.LibUtils;
+import com.readrops.api.utils.HttpManager;
+import com.readrops.api.utils.LibUtils;
 
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
diff --git a/app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt b/app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt
index dbd4f36b..95a9f200 100644
--- a/app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt
+++ b/app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt
@@ -8,7 +8,7 @@ import com.readrops.readropsdb.Database
 import com.readrops.readropsdb.entities.Feed
 import com.readrops.readropsdb.entities.Item
 import com.readrops.readropsdb.entities.account.Account
-import com.readrops.readropslibrary.services.SyncResult
+import com.readrops.api.services.SyncResult
 
 /**
  * Simple class to get synchro notification content (title, content and largeIcon) according to some rules
diff --git a/app/src/main/java/com/readrops/app/utils/SyncResultDebugData.kt b/app/src/main/java/com/readrops/app/utils/SyncResultDebugData.kt
index 0aa45358..00cfebbb 100644
--- a/app/src/main/java/com/readrops/app/utils/SyncResultDebugData.kt
+++ b/app/src/main/java/com/readrops/app/utils/SyncResultDebugData.kt
@@ -5,7 +5,7 @@ import com.readrops.readropsdb.Database
 import com.readrops.readropsdb.entities.Item
 import com.readrops.readropsdb.entities.account.Account
 import com.readrops.readropsdb.entities.account.AccountType
-import com.readrops.readropslibrary.services.SyncResult
+import com.readrops.api.services.SyncResult
 import org.jetbrains.annotations.TestOnly
 
 class SyncResultDebugData {
diff --git a/app/src/main/java/com/readrops/app/utils/SyncWorker.kt b/app/src/main/java/com/readrops/app/utils/SyncWorker.kt
index 872a84fc..eb3b41ff 100644
--- a/app/src/main/java/com/readrops/app/utils/SyncWorker.kt
+++ b/app/src/main/java/com/readrops/app/utils/SyncWorker.kt
@@ -16,7 +16,7 @@ import com.readrops.app.repositories.ARepository
 import com.readrops.readropsdb.Database
 import com.readrops.readropsdb.entities.Item
 import com.readrops.readropsdb.entities.account.Account
-import com.readrops.readropslibrary.services.SyncResult
+import com.readrops.api.services.SyncResult
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 
diff --git a/app/src/main/java/com/readrops/app/utils/Utils.java b/app/src/main/java/com/readrops/app/utils/Utils.java
index 861e2f48..e9d1b287 100644
--- a/app/src/main/java/com/readrops/app/utils/Utils.java
+++ b/app/src/main/java/com/readrops/app/utils/Utils.java
@@ -15,7 +15,7 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 
 import com.google.android.material.snackbar.Snackbar;
-import com.readrops.readropslibrary.utils.HttpManager;
+import com.readrops.api.utils.HttpManager;
 
 import org.jsoup.Jsoup;
 
diff --git a/app/src/main/java/com/readrops/app/utils/matchers/FeedMatcher.java b/app/src/main/java/com/readrops/app/utils/matchers/FeedMatcher.java
index a344ffa4..21fc89e3 100644
--- a/app/src/main/java/com/readrops/app/utils/matchers/FeedMatcher.java
+++ b/app/src/main/java/com/readrops/app/utils/matchers/FeedMatcher.java
@@ -1,10 +1,10 @@
 package com.readrops.app.utils.matchers;
 
 import com.readrops.readropsdb.entities.Feed;
-import com.readrops.readropslibrary.localfeed.atom.ATOMFeed;
-import com.readrops.readropslibrary.localfeed.json.JSONFeed;
-import com.readrops.readropslibrary.localfeed.rss.RSSChannel;
-import com.readrops.readropslibrary.localfeed.rss.RSSFeed;
+import com.readrops.api.localfeed.atom.ATOMFeed;
+import com.readrops.api.localfeed.json.JSONFeed;
+import com.readrops.api.localfeed.rss.RSSChannel;
+import com.readrops.api.localfeed.rss.RSSFeed;
 
 import org.jsoup.Jsoup;
 
diff --git a/app/src/main/java/com/readrops/app/utils/matchers/ItemMatcher.java b/app/src/main/java/com/readrops/app/utils/matchers/ItemMatcher.java
index 093e9008..2eabf35b 100644
--- a/app/src/main/java/com/readrops/app/utils/matchers/ItemMatcher.java
+++ b/app/src/main/java/com/readrops/app/utils/matchers/ItemMatcher.java
@@ -4,12 +4,12 @@ import com.readrops.app.utils.DateUtils;
 import com.readrops.app.utils.Utils;
 import com.readrops.readropsdb.entities.Feed;
 import com.readrops.readropsdb.entities.Item;
-import com.readrops.readropslibrary.localfeed.atom.ATOMEntry;
-import com.readrops.readropslibrary.localfeed.json.JSONItem;
-import com.readrops.readropslibrary.localfeed.rss.RSSEnclosure;
-import com.readrops.readropslibrary.localfeed.rss.RSSItem;
-import com.readrops.readropslibrary.localfeed.rss.RSSMediaContent;
-import com.readrops.readropslibrary.utils.ParseException;
+import com.readrops.api.localfeed.atom.ATOMEntry;
+import com.readrops.api.localfeed.json.JSONItem;
+import com.readrops.api.localfeed.rss.RSSEnclosure;
+import com.readrops.api.localfeed.rss.RSSItem;
+import com.readrops.api.localfeed.rss.RSSMediaContent;
+import com.readrops.api.utils.ParseException;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/readrops/app/utils/matchers/OPMLMatcher.kt b/app/src/main/java/com/readrops/app/utils/matchers/OPMLMatcher.kt
index 4ca9045c..31fe2b9d 100644
--- a/app/src/main/java/com/readrops/app/utils/matchers/OPMLMatcher.kt
+++ b/app/src/main/java/com/readrops/app/utils/matchers/OPMLMatcher.kt
@@ -4,10 +4,10 @@ import android.content.Context
 import com.readrops.app.R
 import com.readrops.readropsdb.entities.Feed
 import com.readrops.readropsdb.entities.Folder
-import com.readrops.readropslibrary.opml.model.Body
-import com.readrops.readropslibrary.opml.model.Head
-import com.readrops.readropslibrary.opml.model.OPML
-import com.readrops.readropslibrary.opml.model.Outline
+import com.readrops.api.opml.model.Body
+import com.readrops.api.opml.model.Head
+import com.readrops.api.opml.model.OPML
+import com.readrops.api.opml.model.Outline
 
 object OPMLMatcher {
 
diff --git a/app/src/main/java/com/readrops/app/viewmodels/AccountViewModel.java b/app/src/main/java/com/readrops/app/viewmodels/AccountViewModel.java
index ff9b5c2d..3243797e 100644
--- a/app/src/main/java/com/readrops/app/viewmodels/AccountViewModel.java
+++ b/app/src/main/java/com/readrops/app/viewmodels/AccountViewModel.java
@@ -14,7 +14,7 @@ import com.readrops.readropsdb.entities.account.Account;
 import com.readrops.readropsdb.entities.account.AccountType;
 import com.readrops.app.repositories.ARepository;
 import com.readrops.app.utils.matchers.OPMLMatcher;
-import com.readrops.readropslibrary.opml.OPMLParser;
+import com.readrops.api.opml.OPMLParser;
 
 import java.util.List;
 import java.util.Map;
diff --git a/app/src/main/java/com/readrops/app/viewmodels/AddFeedsViewModel.java b/app/src/main/java/com/readrops/app/viewmodels/AddFeedsViewModel.java
index 0c5d4108..fb2bfc22 100644
--- a/app/src/main/java/com/readrops/app/viewmodels/AddFeedsViewModel.java
+++ b/app/src/main/java/com/readrops/app/viewmodels/AddFeedsViewModel.java
@@ -13,7 +13,7 @@ import com.readrops.app.repositories.ARepository;
 import com.readrops.app.utils.FeedInsertionResult;
 import com.readrops.app.utils.HtmlParser;
 import com.readrops.app.utils.ParsingResult;
-import com.readrops.readropslibrary.localfeed.RSSQuery;
+import com.readrops.api.localfeed.RSSQuery;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/settings.gradle b/settings.gradle
index d090ad46..9da6bbfa 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':readropslibrary', ':readropsdb'
+include ':app', ':api', ':readropsdb'