diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
index 58d9ea6b..01d6d252 100644
--- a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
@@ -45,10 +45,10 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.account.OCAccount;
 import com.owncloud.android.lib.refactor.authentication.credentials.OwnCloudCredentialsFactory;
-import com.owncloud.android.lib.refactor.resources.files.DownloadRemoteFileOperation;
-import com.owncloud.android.lib.refactor.resources.files.PropfindOperation;
-import com.owncloud.android.lib.refactor.resources.files.RemoveRemoteFileOperation;
-import com.owncloud.android.lib.refactor.resources.files.UploadRemoteFileOperation;
+import com.owncloud.android.lib.refactor.operations.files.DownloadRemoteFileOperation;
+import com.owncloud.android.lib.refactor.operations.files.PropfindOperation;
+import com.owncloud.android.lib.refactor.operations.files.RemoveRemoteFileOperation;
+import com.owncloud.android.lib.refactor.operations.files.UploadRemoteFileOperation;
 import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
 import com.owncloud.android.lib.resources.files.RemoteFile;
diff --git a/src/com/owncloud/android/lib/refactor/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/operations/files/DownloadRemoteFileOperation.java
similarity index 97%
rename from src/com/owncloud/android/lib/refactor/resources/files/DownloadRemoteFileOperation.java
rename to src/com/owncloud/android/lib/refactor/operations/files/DownloadRemoteFileOperation.java
index e3634e34..e754e199 100644
--- a/src/com/owncloud/android/lib/refactor/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/files/DownloadRemoteFileOperation.java
@@ -21,7 +21,7 @@
  *   THE SOFTWARE.
  */
 
-package com.owncloud.android.lib.refactor.resources.files;
+package com.owncloud.android.lib.refactor.operations.files;
 
 import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.operations.RemoteOperation;
diff --git a/src/com/owncloud/android/lib/refactor/resources/files/PropfindOperation.java b/src/com/owncloud/android/lib/refactor/operations/files/PropfindOperation.java
similarity index 97%
rename from src/com/owncloud/android/lib/refactor/resources/files/PropfindOperation.java
rename to src/com/owncloud/android/lib/refactor/operations/files/PropfindOperation.java
index 83ce0964..782e0f18 100644
--- a/src/com/owncloud/android/lib/refactor/resources/files/PropfindOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/files/PropfindOperation.java
@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.lib.refactor.resources.files;
+package com.owncloud.android.lib.refactor.operations.files;
 
 import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.operations.RemoteOperation;
diff --git a/src/com/owncloud/android/lib/refactor/resources/files/RemoveRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/operations/files/RemoveRemoteFileOperation.java
similarity index 97%
rename from src/com/owncloud/android/lib/refactor/resources/files/RemoveRemoteFileOperation.java
rename to src/com/owncloud/android/lib/refactor/operations/files/RemoveRemoteFileOperation.java
index 93a57a5a..3d96ee46 100644
--- a/src/com/owncloud/android/lib/refactor/resources/files/RemoveRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/files/RemoveRemoteFileOperation.java
@@ -22,7 +22,7 @@
  *
  */
 
-package com.owncloud.android.lib.refactor.resources.files;
+package com.owncloud.android.lib.refactor.operations.files;
 
 import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.operations.RemoteOperation;
diff --git a/src/com/owncloud/android/lib/refactor/resources/files/UploadRemoteFileOperation.java b/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
similarity index 98%
rename from src/com/owncloud/android/lib/refactor/resources/files/UploadRemoteFileOperation.java
rename to src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
index 1152ad44..d6a06663 100644
--- a/src/com/owncloud/android/lib/refactor/resources/files/UploadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/refactor/operations/files/UploadRemoteFileOperation.java
@@ -21,7 +21,7 @@
  *   THE SOFTWARE.
  */
 
-package com.owncloud.android.lib.refactor.resources.files;
+package com.owncloud.android.lib.refactor.operations.files;
 
 import com.owncloud.android.lib.refactor.OCContext;
 import com.owncloud.android.lib.refactor.operations.RemoteOperation;
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index 939031db..ebfcb1a1 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -33,7 +33,7 @@ import android.os.Parcelable;
 
 import com.owncloud.android.lib.common.network.WebdavEntry;
 import com.owncloud.android.lib.refactor.OCContext;
-import com.owncloud.android.lib.refactor.RemoteOperation;
+import com.owncloud.android.lib.refactor.operations.RemoteOperation;
 
 import at.bitfire.dav4android.DavResource;
 import at.bitfire.dav4android.PropertyCollection;