diff --git a/app/build.gradle b/app/build.gradle
index df11e5f..a15a34e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
     buildToolsVersion "29.0.2"
 
     defaultConfig {
-        applicationId "com.yausername.dvd"
+        applicationId "org.yausername.dvd"
         minSdkVersion 21
         targetSdkVersion 29
         versionCode versionMajor * 1000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
diff --git a/app/schemas/com.yausername.dvd.database.AppDatabase/1.json b/app/schemas/org.yausername.dvd.database.AppDatabase/1.json
similarity index 100%
rename from app/schemas/com.yausername.dvd.database.AppDatabase/1.json
rename to app/schemas/org.yausername.dvd.database.AppDatabase/1.json
diff --git a/app/src/androidTest/java/com/yausername/dvd/ExampleInstrumentedTest.kt b/app/src/androidTest/java/org/yausername/dvd/ExampleInstrumentedTest.kt
similarity index 86%
rename from app/src/androidTest/java/com/yausername/dvd/ExampleInstrumentedTest.kt
rename to app/src/androidTest/java/org/yausername/dvd/ExampleInstrumentedTest.kt
index 44cf56b..cf94aab 100644
--- a/app/src/androidTest/java/com/yausername/dvd/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/org/yausername/dvd/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd
+package org.yausername.dvd
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
@@ -17,6 +17,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.yausername.dvd", appContext.packageName)
+        assertEquals("org.yausername.dvd", appContext.packageName)
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c39099d..6432528 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.yausername.dvd">
+    package="org.yausername.dvd">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/app/src/main/java/com/yausername/dvd/App.kt b/app/src/main/java/org/yausername/dvd/App.kt
similarity index 97%
rename from app/src/main/java/com/yausername/dvd/App.kt
rename to app/src/main/java/org/yausername/dvd/App.kt
index 9e99ad2..ff7a558 100644
--- a/app/src/main/java/com/yausername/dvd/App.kt
+++ b/app/src/main/java/org/yausername/dvd/App.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd
+package org.yausername.dvd
 
 import android.app.Application
 import android.widget.Toast
diff --git a/app/src/main/java/com/yausername/dvd/adapters/DownloadsAdapter.kt b/app/src/main/java/org/yausername/dvd/adapters/DownloadsAdapter.kt
similarity index 96%
rename from app/src/main/java/com/yausername/dvd/adapters/DownloadsAdapter.kt
rename to app/src/main/java/org/yausername/dvd/adapters/DownloadsAdapter.kt
index 7234a8b..440dfe3 100644
--- a/app/src/main/java/com/yausername/dvd/adapters/DownloadsAdapter.kt
+++ b/app/src/main/java/org/yausername/dvd/adapters/DownloadsAdapter.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd.adapters
+package org.yausername.dvd.adapters
 
 
 import android.annotation.SuppressLint
@@ -12,8 +12,8 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.content.ContextCompat.startActivity
 import androidx.recyclerview.widget.RecyclerView
-import com.yausername.dvd.R
-import com.yausername.dvd.database.Download
+import org.yausername.dvd.R
+import org.yausername.dvd.database.Download
 import kotlinx.android.synthetic.main.fragment_downloads.view.*
 
 
diff --git a/app/src/main/java/com/yausername/dvd/adapters/VidInfoAdapter.kt b/app/src/main/java/org/yausername/dvd/adapters/VidInfoAdapter.kt
similarity index 97%
rename from app/src/main/java/com/yausername/dvd/adapters/VidInfoAdapter.kt
rename to app/src/main/java/org/yausername/dvd/adapters/VidInfoAdapter.kt
index 2b25466..19ac64c 100644
--- a/app/src/main/java/com/yausername/dvd/adapters/VidInfoAdapter.kt
+++ b/app/src/main/java/org/yausername/dvd/adapters/VidInfoAdapter.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd.adapters
+package org.yausername.dvd.adapters
 
 import android.text.format.Formatter
 import android.view.LayoutInflater
@@ -7,9 +7,9 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.yausername.dvd.R
-import com.yausername.dvd.model.VidInfoItem
-import com.yausername.dvd.utils.NumberUtils
+import org.yausername.dvd.R
+import org.yausername.dvd.model.VidInfoItem
+import org.yausername.dvd.utils.NumberUtils
 import com.yausername.youtubedl_android.mapper.VideoInfo
 import kotlinx.android.synthetic.main.vid_format.view.*
 import kotlinx.android.synthetic.main.vid_header.view.*
diff --git a/app/src/main/java/com/yausername/dvd/database/AppDatabase.kt b/app/src/main/java/org/yausername/dvd/database/AppDatabase.kt
similarity index 96%
rename from app/src/main/java/com/yausername/dvd/database/AppDatabase.kt
rename to app/src/main/java/org/yausername/dvd/database/AppDatabase.kt
index 5aa3c27..f3cf4c4 100644
--- a/app/src/main/java/com/yausername/dvd/database/AppDatabase.kt
+++ b/app/src/main/java/org/yausername/dvd/database/AppDatabase.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd.database
+package org.yausername.dvd.database
 
 import android.content.Context
 import androidx.room.Database
diff --git a/app/src/main/java/com/yausername/dvd/database/Download.kt b/app/src/main/java/org/yausername/dvd/database/Download.kt
similarity index 95%
rename from app/src/main/java/com/yausername/dvd/database/Download.kt
rename to app/src/main/java/org/yausername/dvd/database/Download.kt
index 472d2a2..d2f7275 100644
--- a/app/src/main/java/com/yausername/dvd/database/Download.kt
+++ b/app/src/main/java/org/yausername/dvd/database/Download.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd.database
+package org.yausername.dvd.database
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
diff --git a/app/src/main/java/com/yausername/dvd/database/DownloadsDao.kt b/app/src/main/java/org/yausername/dvd/database/DownloadsDao.kt
similarity index 91%
rename from app/src/main/java/com/yausername/dvd/database/DownloadsDao.kt
rename to app/src/main/java/org/yausername/dvd/database/DownloadsDao.kt
index a66d763..3ed9a45 100644
--- a/app/src/main/java/com/yausername/dvd/database/DownloadsDao.kt
+++ b/app/src/main/java/org/yausername/dvd/database/DownloadsDao.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd.database
+package org.yausername.dvd.database
 
 import androidx.lifecycle.LiveData
 import androidx.room.*
diff --git a/app/src/main/java/com/yausername/dvd/database/DownloadsRepository.kt b/app/src/main/java/org/yausername/dvd/database/DownloadsRepository.kt
similarity index 92%
rename from app/src/main/java/com/yausername/dvd/database/DownloadsRepository.kt
rename to app/src/main/java/org/yausername/dvd/database/DownloadsRepository.kt
index 9280354..4a26aa0 100644
--- a/app/src/main/java/com/yausername/dvd/database/DownloadsRepository.kt
+++ b/app/src/main/java/org/yausername/dvd/database/DownloadsRepository.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd.database
+package org.yausername.dvd.database
 
 import androidx.lifecycle.LiveData
 
diff --git a/app/src/main/java/com/yausername/dvd/model/VidInfoItem.kt b/app/src/main/java/org/yausername/dvd/model/VidInfoItem.kt
similarity index 94%
rename from app/src/main/java/com/yausername/dvd/model/VidInfoItem.kt
rename to app/src/main/java/org/yausername/dvd/model/VidInfoItem.kt
index 214a522..0118c1e 100644
--- a/app/src/main/java/com/yausername/dvd/model/VidInfoItem.kt
+++ b/app/src/main/java/org/yausername/dvd/model/VidInfoItem.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd.model
+package org.yausername.dvd.model
 
 import com.yausername.youtubedl_android.mapper.VideoFormat
 import com.yausername.youtubedl_android.mapper.VideoInfo
diff --git a/app/src/main/java/com/yausername/dvd/ui/DownloadPathDialogFragment.kt b/app/src/main/java/org/yausername/dvd/ui/DownloadPathDialogFragment.kt
similarity index 97%
rename from app/src/main/java/com/yausername/dvd/ui/DownloadPathDialogFragment.kt
rename to app/src/main/java/org/yausername/dvd/ui/DownloadPathDialogFragment.kt
index a5c231a..e352b19 100644
--- a/app/src/main/java/com/yausername/dvd/ui/DownloadPathDialogFragment.kt
+++ b/app/src/main/java/org/yausername/dvd/ui/DownloadPathDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd.ui
+package org.yausername.dvd.ui
 
 import android.app.Dialog
 import android.content.Context
@@ -8,7 +8,7 @@ import android.provider.DocumentsContract
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.preference.PreferenceManager
-import com.yausername.dvd.R
+import org.yausername.dvd.R
 import kotlinx.android.synthetic.main.dialog_fragment_download_path.view.*
 
 class DownloadPathDialogFragment : DialogFragment() {
diff --git a/app/src/main/java/com/yausername/dvd/ui/DownloadsFragment.kt b/app/src/main/java/org/yausername/dvd/ui/DownloadsFragment.kt
similarity index 87%
rename from app/src/main/java/com/yausername/dvd/ui/DownloadsFragment.kt
rename to app/src/main/java/org/yausername/dvd/ui/DownloadsFragment.kt
index 0078dbc..dc9a394 100644
--- a/app/src/main/java/com/yausername/dvd/ui/DownloadsFragment.kt
+++ b/app/src/main/java/org/yausername/dvd/ui/DownloadsFragment.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd.ui
+package org.yausername.dvd.ui
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -8,9 +8,9 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.RecyclerView
-import com.yausername.dvd.R
-import com.yausername.dvd.adapters.DownloadsAdapter
-import com.yausername.dvd.vm.DownloadsViewModel
+import org.yausername.dvd.R
+import org.yausername.dvd.adapters.DownloadsAdapter
+import org.yausername.dvd.vm.DownloadsViewModel
 
 
 class DownloadsFragment : Fragment() {
diff --git a/app/src/main/java/com/yausername/dvd/ui/HomeFragment.kt b/app/src/main/java/org/yausername/dvd/ui/HomeFragment.kt
similarity index 91%
rename from app/src/main/java/com/yausername/dvd/ui/HomeFragment.kt
rename to app/src/main/java/org/yausername/dvd/ui/HomeFragment.kt
index a302f2e..a1637db 100644
--- a/app/src/main/java/com/yausername/dvd/ui/HomeFragment.kt
+++ b/app/src/main/java/org/yausername/dvd/ui/HomeFragment.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd.ui
+package org.yausername.dvd.ui
 
 import android.Manifest
 import android.app.Activity
@@ -21,20 +21,20 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
 import androidx.work.*
 import com.squareup.picasso.Picasso
-import com.yausername.dvd.R
-import com.yausername.dvd.adapters.VidInfoAdapter
-import com.yausername.dvd.adapters.VidInfoListener
-import com.yausername.dvd.model.VidInfoItem
-import com.yausername.dvd.vm.LoadState
-import com.yausername.dvd.vm.VidInfoViewModel
-import com.yausername.dvd.work.DownloadWorker
-import com.yausername.dvd.work.DownloadWorker.Companion.acodecKey
-import com.yausername.dvd.work.DownloadWorker.Companion.downloadDirKey
-import com.yausername.dvd.work.DownloadWorker.Companion.formatIdKey
-import com.yausername.dvd.work.DownloadWorker.Companion.nameKey
-import com.yausername.dvd.work.DownloadWorker.Companion.sizeKey
-import com.yausername.dvd.work.DownloadWorker.Companion.urlKey
-import com.yausername.dvd.work.DownloadWorker.Companion.vcodecKey
+import org.yausername.dvd.R
+import org.yausername.dvd.adapters.VidInfoAdapter
+import org.yausername.dvd.adapters.VidInfoListener
+import org.yausername.dvd.model.VidInfoItem
+import org.yausername.dvd.vm.LoadState
+import org.yausername.dvd.vm.VidInfoViewModel
+import org.yausername.dvd.work.DownloadWorker
+import org.yausername.dvd.work.DownloadWorker.Companion.acodecKey
+import org.yausername.dvd.work.DownloadWorker.Companion.downloadDirKey
+import org.yausername.dvd.work.DownloadWorker.Companion.formatIdKey
+import org.yausername.dvd.work.DownloadWorker.Companion.nameKey
+import org.yausername.dvd.work.DownloadWorker.Companion.sizeKey
+import org.yausername.dvd.work.DownloadWorker.Companion.urlKey
+import org.yausername.dvd.work.DownloadWorker.Companion.vcodecKey
 import kotlinx.android.synthetic.main.fragment_home.*
 import kotlinx.android.synthetic.main.fragment_home.view.*
 
diff --git a/app/src/main/java/com/yausername/dvd/ui/MainActivity.kt b/app/src/main/java/org/yausername/dvd/ui/MainActivity.kt
similarity index 97%
rename from app/src/main/java/com/yausername/dvd/ui/MainActivity.kt
rename to app/src/main/java/org/yausername/dvd/ui/MainActivity.kt
index 2ae25ec..13c304f 100644
--- a/app/src/main/java/com/yausername/dvd/ui/MainActivity.kt
+++ b/app/src/main/java/org/yausername/dvd/ui/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd.ui
+package org.yausername.dvd.ui
 
 import android.content.Intent
 import android.os.Bundle
@@ -17,8 +17,8 @@ import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.NavigationUI
 import androidx.navigation.ui.setupWithNavController
-import com.yausername.dvd.R
-import com.yausername.dvd.vm.VidInfoViewModel
+import org.yausername.dvd.R
+import org.yausername.dvd.vm.VidInfoViewModel
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity(), NavActivity {
diff --git a/app/src/main/java/com/yausername/dvd/ui/SettingsFragment.kt b/app/src/main/java/org/yausername/dvd/ui/SettingsFragment.kt
similarity index 97%
rename from app/src/main/java/com/yausername/dvd/ui/SettingsFragment.kt
rename to app/src/main/java/org/yausername/dvd/ui/SettingsFragment.kt
index ae13f00..c39e053 100644
--- a/app/src/main/java/com/yausername/dvd/ui/SettingsFragment.kt
+++ b/app/src/main/java/org/yausername/dvd/ui/SettingsFragment.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd.ui
+package org.yausername.dvd.ui
 
 import android.app.Activity
 import android.content.Intent
@@ -18,9 +18,9 @@ import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
-import com.yausername.dvd.R
-import com.yausername.dvd.work.YoutubeDLUpdateWorker
-import com.yausername.dvd.work.YoutubeDLUpdateWorker.Companion.workTag
+import org.yausername.dvd.R
+import org.yausername.dvd.work.YoutubeDLUpdateWorker
+import org.yausername.dvd.work.YoutubeDLUpdateWorker.Companion.workTag
 import com.yausername.youtubedl_android.YoutubeDL
 
 
diff --git a/app/src/main/java/com/yausername/dvd/ui/YoutubeDlFragment.kt b/app/src/main/java/org/yausername/dvd/ui/YoutubeDlFragment.kt
similarity index 95%
rename from app/src/main/java/com/yausername/dvd/ui/YoutubeDlFragment.kt
rename to app/src/main/java/org/yausername/dvd/ui/YoutubeDlFragment.kt
index 3a1efd0..b964596 100644
--- a/app/src/main/java/com/yausername/dvd/ui/YoutubeDlFragment.kt
+++ b/app/src/main/java/org/yausername/dvd/ui/YoutubeDlFragment.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd.ui
+package org.yausername.dvd.ui
 
 import android.Manifest
 import android.content.pm.PackageManager
@@ -11,9 +11,9 @@ import android.widget.Toast
 import androidx.core.content.ContextCompat.checkSelfPermission
 import androidx.fragment.app.Fragment
 import androidx.work.*
-import com.yausername.dvd.R
-import com.yausername.dvd.work.CommandWorker
-import com.yausername.dvd.work.CommandWorker.Companion.commandKey
+import org.yausername.dvd.R
+import org.yausername.dvd.work.CommandWorker
+import org.yausername.dvd.work.CommandWorker.Companion.commandKey
 import kotlinx.android.synthetic.main.fragment_youtube_dl.*
 
 class YoutubeDlFragment : Fragment(), View.OnClickListener {
diff --git a/app/src/main/java/com/yausername/dvd/utils/NumberUtils.java b/app/src/main/java/org/yausername/dvd/utils/NumberUtils.java
similarity index 97%
rename from app/src/main/java/com/yausername/dvd/utils/NumberUtils.java
rename to app/src/main/java/org/yausername/dvd/utils/NumberUtils.java
index c99317c..6aee24a 100644
--- a/app/src/main/java/com/yausername/dvd/utils/NumberUtils.java
+++ b/app/src/main/java/org/yausername/dvd/utils/NumberUtils.java
@@ -1,4 +1,4 @@
-package com.yausername.dvd.utils;
+package org.yausername.dvd.utils;
 
 import java.util.Map;
 import java.util.NavigableMap;
diff --git a/app/src/main/java/com/yausername/dvd/vm/DownloadsViewModel.kt b/app/src/main/java/org/yausername/dvd/vm/DownloadsViewModel.kt
similarity index 84%
rename from app/src/main/java/com/yausername/dvd/vm/DownloadsViewModel.kt
rename to app/src/main/java/org/yausername/dvd/vm/DownloadsViewModel.kt
index e7de978..3c5ab8e 100644
--- a/app/src/main/java/com/yausername/dvd/vm/DownloadsViewModel.kt
+++ b/app/src/main/java/org/yausername/dvd/vm/DownloadsViewModel.kt
@@ -1,12 +1,12 @@
-package com.yausername.dvd.vm
+package org.yausername.dvd.vm
 
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.viewModelScope
-import com.yausername.dvd.database.AppDatabase
-import com.yausername.dvd.database.Download
-import com.yausername.dvd.database.DownloadsRepository
+import org.yausername.dvd.database.AppDatabase
+import org.yausername.dvd.database.Download
+import org.yausername.dvd.database.DownloadsRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
diff --git a/app/src/main/java/com/yausername/dvd/vm/VidInfoViewModel.kt b/app/src/main/java/org/yausername/dvd/vm/VidInfoViewModel.kt
similarity index 95%
rename from app/src/main/java/com/yausername/dvd/vm/VidInfoViewModel.kt
rename to app/src/main/java/org/yausername/dvd/vm/VidInfoViewModel.kt
index 9441272..91b15a8 100644
--- a/app/src/main/java/com/yausername/dvd/vm/VidInfoViewModel.kt
+++ b/app/src/main/java/org/yausername/dvd/vm/VidInfoViewModel.kt
@@ -1,9 +1,9 @@
-package com.yausername.dvd.vm
+package org.yausername.dvd.vm
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.yausername.dvd.model.VidInfoItem
+import org.yausername.dvd.model.VidInfoItem
 import com.yausername.youtubedl_android.YoutubeDL
 import com.yausername.youtubedl_android.mapper.VideoInfo
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/yausername/dvd/work/CommandWorker.kt b/app/src/main/java/org/yausername/dvd/work/CommandWorker.kt
similarity index 98%
rename from app/src/main/java/com/yausername/dvd/work/CommandWorker.kt
rename to app/src/main/java/org/yausername/dvd/work/CommandWorker.kt
index 39782df..6ec3e2e 100644
--- a/app/src/main/java/com/yausername/dvd/work/CommandWorker.kt
+++ b/app/src/main/java/org/yausername/dvd/work/CommandWorker.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd.work
+package org.yausername.dvd.work
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -8,7 +8,7 @@ import androidx.core.app.NotificationCompat
 import androidx.work.CoroutineWorker
 import androidx.work.ForegroundInfo
 import androidx.work.WorkerParameters
-import com.yausername.dvd.R
+import org.yausername.dvd.R
 import com.yausername.youtubedl_android.YoutubeDL
 import com.yausername.youtubedl_android.YoutubeDLRequest
 import java.util.*
diff --git a/app/src/main/java/com/yausername/dvd/work/DownloadWorker.kt b/app/src/main/java/org/yausername/dvd/work/DownloadWorker.kt
similarity index 96%
rename from app/src/main/java/com/yausername/dvd/work/DownloadWorker.kt
rename to app/src/main/java/org/yausername/dvd/work/DownloadWorker.kt
index a2fbd0e..7688fbd 100644
--- a/app/src/main/java/com/yausername/dvd/work/DownloadWorker.kt
+++ b/app/src/main/java/org/yausername/dvd/work/DownloadWorker.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd.work
+package org.yausername.dvd.work
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -11,10 +11,10 @@ import androidx.core.app.NotificationCompat
 import androidx.work.CoroutineWorker
 import androidx.work.ForegroundInfo
 import androidx.work.WorkerParameters
-import com.yausername.dvd.R
-import com.yausername.dvd.database.AppDatabase
-import com.yausername.dvd.database.Download
-import com.yausername.dvd.database.DownloadsRepository
+import org.yausername.dvd.R
+import org.yausername.dvd.database.AppDatabase
+import org.yausername.dvd.database.Download
+import org.yausername.dvd.database.DownloadsRepository
 import com.yausername.youtubedl_android.YoutubeDL
 import com.yausername.youtubedl_android.YoutubeDLRequest
 import org.apache.commons.io.IOUtils
diff --git a/app/src/main/java/com/yausername/dvd/work/YoutubeDLUpdateWorker.kt b/app/src/main/java/org/yausername/dvd/work/YoutubeDLUpdateWorker.kt
similarity index 97%
rename from app/src/main/java/com/yausername/dvd/work/YoutubeDLUpdateWorker.kt
rename to app/src/main/java/org/yausername/dvd/work/YoutubeDLUpdateWorker.kt
index ff965f9..5301820 100644
--- a/app/src/main/java/com/yausername/dvd/work/YoutubeDLUpdateWorker.kt
+++ b/app/src/main/java/org/yausername/dvd/work/YoutubeDLUpdateWorker.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd.work
+package org.yausername.dvd.work
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -9,7 +9,7 @@ import androidx.core.app.NotificationCompat
 import androidx.work.CoroutineWorker
 import androidx.work.ForegroundInfo
 import androidx.work.WorkerParameters
-import com.yausername.dvd.R
+import org.yausername.dvd.R
 import com.yausername.youtubedl_android.YoutubeDL
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
diff --git a/app/src/main/res/layout/fragment_downloads_list.xml b/app/src/main/res/layout/fragment_downloads_list.xml
index 3f8aeae..45e4b02 100644
--- a/app/src/main/res/layout/fragment_downloads_list.xml
+++ b/app/src/main/res/layout/fragment_downloads_list.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/list"
-    android:name="com.yausername.dvd.DownloadsFragment"
+    android:name="org.yausername.dvd.DownloadsFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginHorizontal="10dp"
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 186aab8..f0547f3 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -7,23 +7,23 @@
 
     <fragment
         android:id="@+id/home_fragment"
-        android:name="com.yausername.dvd.ui.HomeFragment"
+        android:name="org.yausername.dvd.ui.HomeFragment"
         android:label="@string/app_name"
         tools:layout="@layout/fragment_home" />
 
     <fragment
         android:id="@+id/downloads_fragment"
-        android:name="com.yausername.dvd.ui.DownloadsFragment"
+        android:name="org.yausername.dvd.ui.DownloadsFragment"
         android:label="Downloads"
         tools:layout="@layout/fragment_downloads_list" />
 
     <fragment
         android:id="@+id/settings_fragment"
-        android:name="com.yausername.dvd.ui.SettingsFragment"
+        android:name="org.yausername.dvd.ui.SettingsFragment"
         android:label="Settings" />
 
     <fragment
         android:id="@+id/youtube_dl_fragment"
-        android:name="com.yausername.dvd.ui.YoutubeDlFragment"
+        android:name="org.yausername.dvd.ui.YoutubeDlFragment"
         android:label="youtube-dl" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/test/java/com/yausername/dvd/ExampleUnitTest.kt b/app/src/test/java/org/yausername/dvd/ExampleUnitTest.kt
similarity index 92%
rename from app/src/test/java/com/yausername/dvd/ExampleUnitTest.kt
rename to app/src/test/java/org/yausername/dvd/ExampleUnitTest.kt
index b026852..54cb79e 100644
--- a/app/src/test/java/com/yausername/dvd/ExampleUnitTest.kt
+++ b/app/src/test/java/org/yausername/dvd/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.yausername.dvd
+package org.yausername.dvd
 
 import org.junit.Assert.assertEquals
 import org.junit.Test