diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/CheckPathExistenceRemoteOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CheckPathExistenceRemoteOperation.kt
similarity index 99%
rename from owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/CheckPathExistenceRemoteOperation.kt
rename to owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CheckPathExistenceRemoteOperation.kt
index a91b133a..aafa5fc7 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/CheckPathExistenceRemoteOperation.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CheckPathExistenceRemoteOperation.kt
@@ -21,7 +21,7 @@
 *   THE SOFTWARE.
 *
 */
-package com.owncloud.android.lib.resources.server
+package com.owncloud.android.lib.resources.files
 
 import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.http.HttpConstants
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/ServerService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/FileService.kt
similarity index 94%
rename from owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/ServerService.kt
rename to owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/FileService.kt
index ed994147..2da5bf8f 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/ServerService.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/FileService.kt
@@ -21,11 +21,11 @@
  *   THE SOFTWARE.
  *
  */
-package com.owncloud.android.lib.resources.server
+package com.owncloud.android.lib.resources.files
 
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.resources.Service
 
-interface ServerService: Service {
+interface FileService: Service {
     fun checkPathExistence(path: String, isUserLogged: Boolean): RemoteOperationResult<Boolean>
 }
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
index 58e6256c..90a9c469 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
@@ -31,7 +31,6 @@ import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.lib.resources.server.CheckPathExistenceRemoteOperation;
 import timber.log.Timber;
 
 import java.io.File;
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/GetRemoteStatusOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.kt
similarity index 97%
rename from owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/GetRemoteStatusOperation.kt
rename to owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.kt
index 97c6bad3..b6fd1b39 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/GetRemoteStatusOperation.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.kt
@@ -21,7 +21,7 @@
 *   THE SOFTWARE.
 *
 */
-package com.owncloud.android.lib.resources.server
+package com.owncloud.android.lib.resources.status
 
 import android.net.Uri
 import com.owncloud.android.lib.common.OwnCloudClient
@@ -30,7 +30,6 @@ import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod
 import com.owncloud.android.lib.common.operations.RemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode
-import com.owncloud.android.lib.resources.status.OwnCloudVersion
 import org.json.JSONException
 import org.json.JSONObject
 import timber.log.Timber
@@ -52,7 +51,9 @@ class GetRemoteStatusOperation : RemoteOperation<OwnCloudVersion>() {
     override fun run(client: OwnCloudClient): RemoteOperationResult<OwnCloudVersion> {
 
         val baseUriStr = client.baseUri.toString()
-        if (baseUriStr.startsWith(HTTP_PREFIX) || baseUriStr.startsWith(HTTPS_PREFIX)) {
+        if (baseUriStr.startsWith(HTTP_PREFIX) || baseUriStr.startsWith(
+                HTTPS_PREFIX
+            )) {
             tryConnection(client)
         } else {
             client.baseUri = Uri.parse(HTTPS_PREFIX + baseUriStr)
@@ -92,7 +93,9 @@ class GetRemoteStatusOperation : RemoteOperation<OwnCloudVersion>() {
             while (!redirectedLocation.isNullOrEmpty() && !latestResult.isSuccess) {
                 isRedirectToNonSecureConnection =
                     isRedirectToNonSecureConnection ||
-                            (baseUrlSt.startsWith(HTTPS_PREFIX) && redirectedLocation.startsWith(HTTP_PREFIX))
+                            (baseUrlSt.startsWith(HTTPS_PREFIX) && redirectedLocation.startsWith(
+                                HTTP_PREFIX
+                            ))
 
                 getMethod = GetMethod(URL(redirectedLocation)).apply {
                     setReadTimeout(TRY_CONNECTION_TIMEOUT, TimeUnit.SECONDS)
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/AnonymousService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/ServerInfoService.kt
similarity index 95%
rename from owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/AnonymousService.kt
rename to owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/ServerInfoService.kt
index 53f9fe87..c211c8ff 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/AnonymousService.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/ServerInfoService.kt
@@ -21,12 +21,12 @@
  *   THE SOFTWARE.
  *
  */
-package com.owncloud.android.lib.resources.server
+package com.owncloud.android.lib.resources.status
 
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.resources.status.OwnCloudVersion
 
-interface AnonymousService {
+interface ServerInfoService {
     fun checkPathExistence(path: String, isUserLogged: Boolean): RemoteOperationResult<Boolean>
 
     fun getRemoteStatus(path: String): RemoteOperationResult<OwnCloudVersion>