diff --git a/apks/li/lichess/package.nix b/apks/by-name/li/lichess/package.nix
similarity index 84%
rename from apks/li/lichess/package.nix
rename to apks/by-name/li/lichess/package.nix
index 99157c6..2034a7d 100644
--- a/apks/li/lichess/package.nix
+++ b/apks/by-name/li/lichess/package.nix
@@ -16,17 +16,9 @@ stdenv.mkDerivation rec {
 
 
   nativeBuildInputs = [
-    pkgs.androidenv
-    pkgs.androidsdk
-    pkgs.androidndk
-    pkgs.nodejs-18_x
     pkgs.yarn
   ];
   buildInputs = [
-    pkgs.androidenv
-    pkgs.androidsdk
-    pkgs.androidndk
-    pkgs.nodejs-18_x
     pkgs.yarn
   ];
 
diff --git a/apks/by-name/ni/nix-on-droid/package.nix b/apks/by-name/ni/nix-on-droid/package.nix
new file mode 100644
index 0000000..2c615c0
--- /dev/null
+++ b/apks/by-name/ni/nix-on-droid/package.nix
@@ -0,0 +1,15 @@
+{
+  flutterTools,
+  fetchFromGithub,
+}:
+
+flutterTools.buildApk {
+
+  src = fetchFromGithub {
+    owner = "";
+    repo = "";
+    tag = "";
+    hash = "";
+  }
+
+}
diff --git a/apks/by-name/te/termux/package.nix b/apks/by-name/te/termux/package.nix
new file mode 100644
index 0000000..e69de29
diff --git a/apks/wi/wireguard/package.nix b/apks/by-name/wi/wireguard/package.nix
similarity index 100%
rename from apks/wi/wireguard/package.nix
rename to apks/by-name/wi/wireguard/package.nix
diff --git a/apks/lib/default.nix b/apks/lib/default.nix
new file mode 100644
index 0000000..e69de29