diff --git a/android/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.java b/android/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.java
deleted file mode 100644
index cb61cad60..000000000
--- a/android/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.androidbase;
-
-import android.content.*;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.*;
-import android.util.*;
-
-import org.isoron.androidbase.utils.*;
-
-import java.io.*;
-
-import javax.inject.*;
-
-public class AndroidDirFinder
-{
-    @NonNull
-    private Context context;
-
-    @Inject
-    public AndroidDirFinder(@NonNull @AppContext Context context)
-    {
-        this.context = context;
-    }
-
-    @Nullable
-    public File getFilesDir(@Nullable String relativePath)
-    {
-        File externalFilesDirs[] =
-            ContextCompat.getExternalFilesDirs(context, null);
-        if (externalFilesDirs == null)
-        {
-            Log.e("BaseSystem",
-                "getFilesDir: getExternalFilesDirs returned null");
-            return null;
-        }
-
-        return FileUtils.getDir(externalFilesDirs, relativePath);
-    }
-}
diff --git a/android/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.kt b/android/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.kt
new file mode 100644
index 000000000..f8c13ebe4
--- /dev/null
+++ b/android/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.isoron.androidbase
+
+import android.content.Context
+import androidx.core.content.ContextCompat
+import org.isoron.androidbase.utils.FileUtils
+import java.io.File
+import javax.inject.Inject
+
+class AndroidDirFinder @Inject constructor(@param:AppContext private val context: Context) {
+    fun getFilesDir(relativePath: String?): File? =
+            FileUtils.getDir(
+                    ContextCompat.getExternalFilesDirs(context, null),
+                    relativePath
+            )
+}
\ No newline at end of file