diff --git a/app/build.gradle b/app/build.gradle
index a7f609a82..ee8e6bcde 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ android {
     compileSdk 31
 
     defaultConfig {
-        applicationId 'xyz.btcland.libretube'
+        applicationId 'com.github.libretube'
         minSdk 21
         targetSdk 31
         versionCode 1
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
new file mode 100644
index 000000000..e79250f0c
Binary files /dev/null and b/app/release/app-release.apk differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
new file mode 100644
index 000000000..4f97b5b79
--- /dev/null
+++ b/app/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.github.libretube",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/xyz/btcland/libretube/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/github/libretube/ExampleInstrumentedTest.kt
similarity index 84%
rename from app/src/androidTest/java/xyz/btcland/libretube/ExampleInstrumentedTest.kt
rename to app/src/androidTest/java/com/github/libretube/ExampleInstrumentedTest.kt
index 77e3d2e26..39c054e77 100644
--- a/app/src/androidTest/java/xyz/btcland/libretube/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/github/libretube/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube
+package com.github.libretube
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("xyz.btcland.libretube", appContext.packageName)
+        assertEquals("com.github.libretube", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 911c04168..1c21b30e9 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="xyz.btcland.libretube">
+    package="com.github.libretube">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/app/src/main/java/xyz/btcland/libretube/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/CustomExoPlayerView.kt
similarity index 96%
rename from app/src/main/java/xyz/btcland/libretube/CustomExoPlayerView.kt
rename to app/src/main/java/com/github/libretube/CustomExoPlayerView.kt
index 30dcd07ae..3f325bcd2 100644
--- a/app/src/main/java/xyz/btcland/libretube/CustomExoPlayerView.kt
+++ b/app/src/main/java/com/github/libretube/CustomExoPlayerView.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube
+package com.github.libretube
 
 import android.annotation.SuppressLint
 import android.content.Context
diff --git a/app/src/main/java/xyz/btcland/libretube/Home.kt b/app/src/main/java/com/github/libretube/Home.kt
similarity index 97%
rename from app/src/main/java/xyz/btcland/libretube/Home.kt
rename to app/src/main/java/com/github/libretube/Home.kt
index c54ab6f0e..ef5acca3b 100644
--- a/app/src/main/java/xyz/btcland/libretube/Home.kt
+++ b/app/src/main/java/com/github/libretube/Home.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube
+package com.github.libretube
 
 import android.os.Bundle
 import android.util.Log
@@ -13,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView
 
 import okhttp3.*
 import retrofit2.HttpException
-import xyz.btcland.libretube.adapters.TrendingAdapter
+import com.github.libretube.adapters.TrendingAdapter
 import java.io.IOException
 
 
diff --git a/app/src/main/java/xyz/btcland/libretube/Library.kt b/app/src/main/java/com/github/libretube/Library.kt
similarity index 98%
rename from app/src/main/java/xyz/btcland/libretube/Library.kt
rename to app/src/main/java/com/github/libretube/Library.kt
index 05701f749..ba6f94cde 100644
--- a/app/src/main/java/xyz/btcland/libretube/Library.kt
+++ b/app/src/main/java/com/github/libretube/Library.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube
+package com.github.libretube
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
diff --git a/app/src/main/java/xyz/btcland/libretube/MainActivity.kt b/app/src/main/java/com/github/libretube/MainActivity.kt
similarity index 99%
rename from app/src/main/java/xyz/btcland/libretube/MainActivity.kt
rename to app/src/main/java/com/github/libretube/MainActivity.kt
index f2e930c16..b99dacf9a 100644
--- a/app/src/main/java/xyz/btcland/libretube/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/MainActivity.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube
+package com.github.libretube
 
 import android.content.res.Configuration
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/xyz/btcland/libretube/PipedApi.kt b/app/src/main/java/com/github/libretube/PipedApi.kt
similarity index 77%
rename from app/src/main/java/xyz/btcland/libretube/PipedApi.kt
rename to app/src/main/java/com/github/libretube/PipedApi.kt
index ce0eafce8..fe42fd2e3 100644
--- a/app/src/main/java/xyz/btcland/libretube/PipedApi.kt
+++ b/app/src/main/java/com/github/libretube/PipedApi.kt
@@ -1,11 +1,11 @@
-package xyz.btcland.libretube
+package com.github.libretube
 
 import retrofit2.http.GET
 import retrofit2.http.Path
 import retrofit2.http.Query
-import xyz.btcland.libretube.obj.StreamItem
-import xyz.btcland.libretube.obj.Streams
-import xyz.btcland.libretube.obj.SearchResult
+import com.github.libretube.obj.StreamItem
+import com.github.libretube.obj.Streams
+import com.github.libretube.obj.SearchResult
 
 interface PipedApi {
     @GET("trending")
diff --git a/app/src/main/java/xyz/btcland/libretube/Player.kt b/app/src/main/java/com/github/libretube/Player.kt
similarity index 92%
rename from app/src/main/java/xyz/btcland/libretube/Player.kt
rename to app/src/main/java/com/github/libretube/Player.kt
index 405793cbf..694adcaee 100644
--- a/app/src/main/java/xyz/btcland/libretube/Player.kt
+++ b/app/src/main/java/com/github/libretube/Player.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube
+package com.github.libretube
 
 import android.app.Activity
 import android.content.Context
diff --git a/app/src/main/java/xyz/btcland/libretube/PlayerFragment.kt b/app/src/main/java/com/github/libretube/PlayerFragment.kt
similarity index 99%
rename from app/src/main/java/xyz/btcland/libretube/PlayerFragment.kt
rename to app/src/main/java/com/github/libretube/PlayerFragment.kt
index 4fa2129f6..35b579086 100644
--- a/app/src/main/java/xyz/btcland/libretube/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/PlayerFragment.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube
+package com.github.libretube
 
 import android.R.attr
 import android.R.attr.*
@@ -72,8 +72,8 @@ import retrofit2.Retrofit
 import retrofit2.converter.jackson.JacksonConverterFactory
 import retrofit2.http.GET
 import retrofit2.http.Path
-import xyz.btcland.libretube.adapters.TrendingAdapter
-import xyz.btcland.libretube.obj.PipedStream
+import com.github.libretube.adapters.TrendingAdapter
+import com.github.libretube.obj.PipedStream
 
 
 // TODO: Rename parameter arguments, choose names that match
diff --git a/app/src/main/java/xyz/btcland/libretube/RetrofitInstance.kt b/app/src/main/java/com/github/libretube/RetrofitInstance.kt
similarity index 92%
rename from app/src/main/java/xyz/btcland/libretube/RetrofitInstance.kt
rename to app/src/main/java/com/github/libretube/RetrofitInstance.kt
index fffd97e61..732b9b718 100644
--- a/app/src/main/java/xyz/btcland/libretube/RetrofitInstance.kt
+++ b/app/src/main/java/com/github/libretube/RetrofitInstance.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube
+package com.github.libretube
 
 import retrofit2.Retrofit
 import retrofit2.converter.jackson.JacksonConverterFactory
diff --git a/app/src/main/java/xyz/btcland/libretube/SearchFragment.kt b/app/src/main/java/com/github/libretube/SearchFragment.kt
similarity index 98%
rename from app/src/main/java/xyz/btcland/libretube/SearchFragment.kt
rename to app/src/main/java/com/github/libretube/SearchFragment.kt
index 311c3a97e..8144f4bd9 100644
--- a/app/src/main/java/xyz/btcland/libretube/SearchFragment.kt
+++ b/app/src/main/java/com/github/libretube/SearchFragment.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube
+package com.github.libretube
 
 import android.os.Bundle
 import android.text.Editable
@@ -17,7 +17,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import retrofit2.HttpException
-import xyz.btcland.libretube.adapters.SearchAdapter
+import com.github.libretube.adapters.SearchAdapter
 import java.io.IOException
 
 // TODO: Rename parameter arguments, choose names that match
diff --git a/app/src/main/java/xyz/btcland/libretube/SingleViewTouchableMotionLayout.kt b/app/src/main/java/com/github/libretube/SingleViewTouchableMotionLayout.kt
similarity index 99%
rename from app/src/main/java/xyz/btcland/libretube/SingleViewTouchableMotionLayout.kt
rename to app/src/main/java/com/github/libretube/SingleViewTouchableMotionLayout.kt
index ec85380e9..1338b599f 100644
--- a/app/src/main/java/xyz/btcland/libretube/SingleViewTouchableMotionLayout.kt
+++ b/app/src/main/java/com/github/libretube/SingleViewTouchableMotionLayout.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube
+package com.github.libretube
 
 import android.content.Context
 import android.graphics.Rect
diff --git a/app/src/main/java/xyz/btcland/libretube/Subscriptions.kt b/app/src/main/java/com/github/libretube/Subscriptions.kt
similarity index 98%
rename from app/src/main/java/xyz/btcland/libretube/Subscriptions.kt
rename to app/src/main/java/com/github/libretube/Subscriptions.kt
index 825f12b37..27d4a59d6 100644
--- a/app/src/main/java/xyz/btcland/libretube/Subscriptions.kt
+++ b/app/src/main/java/com/github/libretube/Subscriptions.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube
+package com.github.libretube
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
diff --git a/app/src/main/java/xyz/btcland/libretube/VideoViews.kt b/app/src/main/java/com/github/libretube/VideoViews.kt
similarity index 97%
rename from app/src/main/java/xyz/btcland/libretube/VideoViews.kt
rename to app/src/main/java/com/github/libretube/VideoViews.kt
index 9a3af9824..81c301160 100644
--- a/app/src/main/java/xyz/btcland/libretube/VideoViews.kt
+++ b/app/src/main/java/com/github/libretube/VideoViews.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube
+package com.github.libretube
 
 import java.math.BigDecimal
 import java.math.RoundingMode
diff --git a/app/src/main/java/xyz/btcland/libretube/adapters/SearchAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
similarity index 94%
rename from app/src/main/java/xyz/btcland/libretube/adapters/SearchAdapter.kt
rename to app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
index 108d41d58..153db64ba 100644
--- a/app/src/main/java/xyz/btcland/libretube/adapters/SearchAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube.adapters
+package com.github.libretube.adapters
 
 
 import android.os.Bundle
@@ -12,11 +12,11 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import com.squareup.picasso.Picasso
-import xyz.btcland.libretube.PlayerFragment
-import xyz.btcland.libretube.R
-import xyz.btcland.libretube.obj.SearchItem
-import xyz.btcland.libretube.obj.StreamItem
-import xyz.btcland.libretube.videoViews
+import com.github.libretube.PlayerFragment
+import com.github.libretube.R
+import com.github.libretube.obj.SearchItem
+import com.github.libretube.obj.StreamItem
+import com.github.libretube.videoViews
 
 
 class SearchAdapter(private val searchItems: List<SearchItem>): RecyclerView.Adapter<CustomViewHolder1>() {
diff --git a/app/src/main/java/xyz/btcland/libretube/adapters/TrendingAdapter.kt b/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt
similarity index 91%
rename from app/src/main/java/xyz/btcland/libretube/adapters/TrendingAdapter.kt
rename to app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt
index b67bf516b..10d0f7523 100644
--- a/app/src/main/java/xyz/btcland/libretube/adapters/TrendingAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/TrendingAdapter.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube.adapters
+package com.github.libretube.adapters
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -9,10 +9,10 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
 import com.squareup.picasso.Picasso
-import xyz.btcland.libretube.PlayerFragment
-import xyz.btcland.libretube.R
-import xyz.btcland.libretube.obj.StreamItem
-import xyz.btcland.libretube.videoViews
+import com.github.libretube.PlayerFragment
+import com.github.libretube.R
+import com.github.libretube.obj.StreamItem
+import com.github.libretube.videoViews
 
 class TrendingAdapter(private val videoFeed: List<StreamItem>): RecyclerView.Adapter<CustomViewHolder>() {
     override fun getItemCount(): Int {
diff --git a/app/src/main/java/xyz/btcland/libretube/myApp.kt b/app/src/main/java/com/github/libretube/myApp.kt
similarity index 82%
rename from app/src/main/java/xyz/btcland/libretube/myApp.kt
rename to app/src/main/java/com/github/libretube/myApp.kt
index 1efcca2ea..1f0d7611d 100644
--- a/app/src/main/java/xyz/btcland/libretube/myApp.kt
+++ b/app/src/main/java/com/github/libretube/myApp.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube
+package com.github.libretube
 
 import android.app.Application
 
diff --git a/app/src/main/java/xyz/btcland/libretube/obj/Channel.java b/app/src/main/java/com/github/libretube/obj/Channel.java
similarity index 95%
rename from app/src/main/java/xyz/btcland/libretube/obj/Channel.java
rename to app/src/main/java/com/github/libretube/obj/Channel.java
index 8f4908553..03fc61bb4 100644
--- a/app/src/main/java/xyz/btcland/libretube/obj/Channel.java
+++ b/app/src/main/java/com/github/libretube/obj/Channel.java
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube.obj;
+package com.github.libretube.obj;
 
 import java.util.List;
 
diff --git a/app/src/main/java/xyz/btcland/libretube/obj/ChapterSegment.kt b/app/src/main/java/com/github/libretube/obj/ChapterSegment.kt
similarity index 79%
rename from app/src/main/java/xyz/btcland/libretube/obj/ChapterSegment.kt
rename to app/src/main/java/com/github/libretube/obj/ChapterSegment.kt
index 309f2d775..9df954e40 100644
--- a/app/src/main/java/xyz/btcland/libretube/obj/ChapterSegment.kt
+++ b/app/src/main/java/com/github/libretube/obj/ChapterSegment.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube.obj
+package com.github.libretube.obj
 
 data class ChapterSegment(
     var title: String?,
diff --git a/app/src/main/java/xyz/btcland/libretube/obj/Comment.java b/app/src/main/java/com/github/libretube/obj/Comment.java
similarity index 96%
rename from app/src/main/java/xyz/btcland/libretube/obj/Comment.java
rename to app/src/main/java/com/github/libretube/obj/Comment.java
index aaca4793e..953bb7bdf 100644
--- a/app/src/main/java/xyz/btcland/libretube/obj/Comment.java
+++ b/app/src/main/java/com/github/libretube/obj/Comment.java
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube.obj;
+package com.github.libretube.obj;
 
 public class Comment {
     public String author, thumbnail, commentId, commentText, commentedTime, commentorUrl, repliesPage;
diff --git a/app/src/main/java/xyz/btcland/libretube/obj/CommentsPage.java b/app/src/main/java/com/github/libretube/obj/CommentsPage.java
similarity index 90%
rename from app/src/main/java/xyz/btcland/libretube/obj/CommentsPage.java
rename to app/src/main/java/com/github/libretube/obj/CommentsPage.java
index 3d04f105e..a8fb24b20 100644
--- a/app/src/main/java/xyz/btcland/libretube/obj/CommentsPage.java
+++ b/app/src/main/java/com/github/libretube/obj/CommentsPage.java
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube.obj;
+package com.github.libretube.obj;
 
 import java.util.List;
 
diff --git a/app/src/main/java/xyz/btcland/libretube/obj/FeedItem.java b/app/src/main/java/com/github/libretube/obj/FeedItem.java
similarity index 95%
rename from app/src/main/java/xyz/btcland/libretube/obj/FeedItem.java
rename to app/src/main/java/com/github/libretube/obj/FeedItem.java
index 1bbb81fc8..3acf811f6 100644
--- a/app/src/main/java/xyz/btcland/libretube/obj/FeedItem.java
+++ b/app/src/main/java/com/github/libretube/obj/FeedItem.java
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube.obj;
+package com.github.libretube.obj;
 
 public class FeedItem {
     public String url, title, thumbnail, uploaderUrl, uploaderName, uploaderAvatar;
diff --git a/app/src/main/java/xyz/btcland/libretube/obj/PipedStream.kt b/app/src/main/java/com/github/libretube/obj/PipedStream.kt
similarity index 92%
rename from app/src/main/java/xyz/btcland/libretube/obj/PipedStream.kt
rename to app/src/main/java/com/github/libretube/obj/PipedStream.kt
index 58001d6e2..b390e0088 100644
--- a/app/src/main/java/xyz/btcland/libretube/obj/PipedStream.kt
+++ b/app/src/main/java/com/github/libretube/obj/PipedStream.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube.obj
+package com.github.libretube.obj
 
 data class PipedStream(
     var url: String?,
diff --git a/app/src/main/java/xyz/btcland/libretube/obj/Playlist.kt b/app/src/main/java/com/github/libretube/obj/Playlist.kt
similarity index 91%
rename from app/src/main/java/xyz/btcland/libretube/obj/Playlist.kt
rename to app/src/main/java/com/github/libretube/obj/Playlist.kt
index 35c7503c5..495d63d88 100644
--- a/app/src/main/java/xyz/btcland/libretube/obj/Playlist.kt
+++ b/app/src/main/java/com/github/libretube/obj/Playlist.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube.obj
+package com.github.libretube.obj
 
 data class Playlist(
     var name: String? = null,
diff --git a/app/src/main/java/xyz/btcland/libretube/obj/SearchItem.kt b/app/src/main/java/com/github/libretube/obj/SearchItem.kt
similarity index 94%
rename from app/src/main/java/xyz/btcland/libretube/obj/SearchItem.kt
rename to app/src/main/java/com/github/libretube/obj/SearchItem.kt
index 986c21723..da7943f31 100644
--- a/app/src/main/java/xyz/btcland/libretube/obj/SearchItem.kt
+++ b/app/src/main/java/com/github/libretube/obj/SearchItem.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube.obj
+package com.github.libretube.obj
 
 data class SearchItem(
     var url: String?,
diff --git a/app/src/main/java/xyz/btcland/libretube/obj/SearchResult.kt b/app/src/main/java/com/github/libretube/obj/SearchResult.kt
similarity index 68%
rename from app/src/main/java/xyz/btcland/libretube/obj/SearchResult.kt
rename to app/src/main/java/com/github/libretube/obj/SearchResult.kt
index 29c382189..0a3845c88 100644
--- a/app/src/main/java/xyz/btcland/libretube/obj/SearchResult.kt
+++ b/app/src/main/java/com/github/libretube/obj/SearchResult.kt
@@ -1,6 +1,6 @@
-package xyz.btcland.libretube.obj
+package com.github.libretube.obj
 
-import xyz.btcland.libretube.obj.StreamItem
+import com.github.libretube.obj.StreamItem
 
 data class SearchResult(
     val items: List<SearchItem>? = listOf(),
diff --git a/app/src/main/java/xyz/btcland/libretube/obj/StreamItem.kt b/app/src/main/java/com/github/libretube/obj/StreamItem.kt
similarity index 91%
rename from app/src/main/java/xyz/btcland/libretube/obj/StreamItem.kt
rename to app/src/main/java/com/github/libretube/obj/StreamItem.kt
index 57ff146df..3e2ef8839 100644
--- a/app/src/main/java/xyz/btcland/libretube/obj/StreamItem.kt
+++ b/app/src/main/java/com/github/libretube/obj/StreamItem.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube.obj
+package com.github.libretube.obj
 
 data class StreamItem(
     var url: String?,
diff --git a/app/src/main/java/xyz/btcland/libretube/obj/Streams.kt b/app/src/main/java/com/github/libretube/obj/Streams.kt
similarity index 91%
rename from app/src/main/java/xyz/btcland/libretube/obj/Streams.kt
rename to app/src/main/java/com/github/libretube/obj/Streams.kt
index 2b8f76471..ec8ce94f0 100644
--- a/app/src/main/java/xyz/btcland/libretube/obj/Streams.kt
+++ b/app/src/main/java/com/github/libretube/obj/Streams.kt
@@ -1,6 +1,6 @@
-package xyz.btcland.libretube.obj
+package com.github.libretube.obj
 
-import xyz.btcland.libretube.obj.Subtitle
+import com.github.libretube.obj.Subtitle
 
 data class Streams(
     val title: String?,
diff --git a/app/src/main/java/xyz/btcland/libretube/obj/Subtitle.kt b/app/src/main/java/com/github/libretube/obj/Subtitle.kt
similarity index 85%
rename from app/src/main/java/xyz/btcland/libretube/obj/Subtitle.kt
rename to app/src/main/java/com/github/libretube/obj/Subtitle.kt
index 15cf02511..a309a9b1a 100644
--- a/app/src/main/java/xyz/btcland/libretube/obj/Subtitle.kt
+++ b/app/src/main/java/com/github/libretube/obj/Subtitle.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube.obj
+package com.github.libretube.obj
 
 data class Subtitle(
     val url: String?,
diff --git a/app/src/main/res/layout/activity_player.xml b/app/src/main/res/layout/activity_player.xml
index 7bae1de49..1d61fdda8 100644
--- a/app/src/main/res/layout/activity_player.xml
+++ b/app/src/main/res/layout/activity_player.xml
@@ -8,7 +8,7 @@
     android:background="@color/black"
     >
 
-    <xyz.btcland.libretube.CustomExoPlayerView
+    <com.github.libretube.CustomExoPlayerView
         android:id="@+id/fullscreen_player"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 9ca1adf06..c575ed0b7 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xyz.btcland.libretube.SingleViewTouchableMotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.github.libretube.SingleViewTouchableMotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -209,7 +209,7 @@
         app:layout_constraintTop_toTopOf="parent">
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <xyz.btcland.libretube.CustomExoPlayerView
+    <com.github.libretube.CustomExoPlayerView
         android:id="@+id/player"
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -262,4 +262,4 @@
         android:visibility="gone"
         />
 
-</xyz.btcland.libretube.SingleViewTouchableMotionLayout>
\ No newline at end of file
+</com.github.libretube.SingleViewTouchableMotionLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav.xml b/app/src/main/res/navigation/nav.xml
index 0ac6aa103..f82842a60 100644
--- a/app/src/main/res/navigation/nav.xml
+++ b/app/src/main/res/navigation/nav.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/home2"
-        android:name="xyz.btcland.libretube.Home"
+        android:name="com.github.libretube.Home"
         android:label="fragment_home"
         tools:layout="@layout/fragment_home" >
         <action
@@ -17,7 +17,7 @@
     </fragment>
     <fragment
         android:id="@+id/subscriptions"
-        android:name="xyz.btcland.libretube.Subscriptions"
+        android:name="com.github.libretube.Subscriptions"
         android:label="fragment_subscriptions"
         tools:layout="@layout/fragment_subscriptions" >
         <action
@@ -27,13 +27,13 @@
     </fragment>
     <fragment
         android:id="@+id/library"
-        android:name="xyz.btcland.libretube.Library"
+        android:name="com.github.libretube.Library"
         android:label="fragment_library"
         tools:layout="@layout/fragment_library" >
     </fragment>
     <fragment
         android:id="@+id/searchFragment"
-        android:name="xyz.btcland.libretube.SearchFragment"
+        android:name="com.github.libretube.SearchFragment"
         android:label="fragment_search"
         tools:layout="@layout/fragment_search" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/test/java/xyz/btcland/libretube/ExampleUnitTest.kt b/app/src/test/java/com/github/libretube/ExampleUnitTest.kt
similarity index 91%
rename from app/src/test/java/xyz/btcland/libretube/ExampleUnitTest.kt
rename to app/src/test/java/com/github/libretube/ExampleUnitTest.kt
index fd84ca3c3..31099575e 100644
--- a/app/src/test/java/xyz/btcland/libretube/ExampleUnitTest.kt
+++ b/app/src/test/java/com/github/libretube/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package xyz.btcland.libretube
+package com.github.libretube
 
 import org.junit.Test