diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.kt
similarity index 78%
rename from owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
rename to owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.kt
index 42039dde..6db4092f 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.kt
@@ -21,29 +21,22 @@
  *   THE SOFTWARE.
  *
  */
+package com.owncloud.android.lib.common.http.methods.nonwebdav
 
-package com.owncloud.android.lib.common.http.methods.nonwebdav;
-
-import java.io.IOException;
-import java.net.URL;
+import java.io.IOException
+import java.net.URL
 
 /**
  * OkHttp delete calls wrapper
  *
  * @author David González Verdugo
  */
-public class DeleteMethod extends HttpMethod {
-
-    public DeleteMethod(URL url) {
-        super(url);
-    }
-
-    @Override
-    public int onExecute() throws IOException {
+class DeleteMethod(url: URL?) : HttpMethod(url) {
+    @Throws(IOException::class)
+    override fun onExecute(): Int {
         mRequest = mRequest.newBuilder()
-                .delete()
-                .build();
-
-        return super.onExecute();
+            .delete()
+            .build()
+        return super.onExecute()
     }
-}
\ No newline at end of file
+}
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.kt
similarity index 78%
rename from owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
rename to owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.kt
index 55022bbe..a73ffb9e 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.kt
@@ -21,29 +21,22 @@
  *   THE SOFTWARE.
  *
  */
+package com.owncloud.android.lib.common.http.methods.nonwebdav
 
-package com.owncloud.android.lib.common.http.methods.nonwebdav;
-
-import java.io.IOException;
-import java.net.URL;
+import java.io.IOException
+import java.net.URL
 
 /**
  * OkHttp get calls wrapper
  *
  * @author David González Verdugo
  */
-public class GetMethod extends HttpMethod {
-
-    public GetMethod(URL url) {
-        super(url);
-    }
-
-    @Override
-    public int onExecute() throws IOException {
+class GetMethod(url: URL?) : HttpMethod(url) {
+    @Throws(IOException::class)
+    override fun onExecute(): Int {
         mRequest = mRequest.newBuilder()
-                .get()
-                .build();
-
-        return super.onExecute();
+            .get()
+            .build()
+        return super.onExecute()
     }
-}
\ No newline at end of file
+}
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.kt
similarity index 77%
rename from owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
rename to owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.kt
index 1efb26d0..fb564d3d 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.kt
@@ -21,29 +21,22 @@
  *   THE SOFTWARE.
  *
  */
+package com.owncloud.android.lib.common.http.methods.nonwebdav
 
-package com.owncloud.android.lib.common.http.methods.nonwebdav;
-
-import java.io.IOException;
-import java.net.URL;
+import java.io.IOException
+import java.net.URL
 
 /**
  * OkHttp post calls wrapper
  *
  * @author David González Verdugo
  */
-public class PostMethod extends HttpMethod {
-
-    public PostMethod(URL url) {
-        super(url);
-    }
-
-    @Override
-    public int onExecute() throws IOException {
+class PostMethod(url: URL?) : HttpMethod(url) {
+    @Throws(IOException::class)
+    override fun onExecute(): Int {
         mRequest = mRequest.newBuilder()
-                .post(mRequestBody)
-                .build();
-
-        return super.onExecute();
+            .post(mRequestBody)
+            .build()
+        return super.onExecute()
     }
-}
\ No newline at end of file
+}
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.kt
similarity index 76%
rename from owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
rename to owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.kt
index c51a1958..6842befb 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.kt
@@ -21,24 +21,22 @@
  *   THE SOFTWARE.
  *
  */
+package com.owncloud.android.lib.common.http.methods.nonwebdav
 
-package com.owncloud.android.lib.common.http.methods.nonwebdav;
+import java.io.IOException
+import java.net.URL
 
-import java.io.IOException;
-import java.net.URL;
-
-public class PutMethod extends HttpMethod {
-
-    public PutMethod(URL url) {
-        super(url);
-    }
-
-    @Override
-    public int onExecute() throws IOException {
+/**
+ * OkHttp put calls wrapper
+ *
+ * @author David González Verdugo
+ */
+class PutMethod(url: URL?) : HttpMethod(url) {
+    @Throws(IOException::class)
+    override fun onExecute(): Int {
         mRequest = mRequest.newBuilder()
-                .put(mRequestBody)
-                .build();
-
-        return super.onExecute();
+            .put(mRequestBody)
+            .build()
+        return super.onExecute()
     }
-}
\ No newline at end of file
+}