diff --git a/pkgs/by-name/an/anytype/anytype-heart/default.nix b/pkgs/by-name/an/anytype-heart/package.nix
similarity index 95%
rename from pkgs/by-name/an/anytype/anytype-heart/default.nix
rename to pkgs/by-name/an/anytype-heart/package.nix
index 8f8fe2b3586c..894390f86e33 100644
--- a/pkgs/by-name/an/anytype/anytype-heart/default.nix
+++ b/pkgs/by-name/an/anytype-heart/package.nix
@@ -1,16 +1,15 @@
 {
   stdenv,
   lib,
-  callPackage,
   fetchFromGitHub,
   buildGoModule,
   protoc-gen-grpc-web,
   protoc-gen-js,
   protobuf,
+  tantivy-go,
 }:
 
 let
-  tantivy-go = callPackage ../tantivy-go { };
   pname = "anytype-heart";
   version = "0.39.11";
   src = fetchFromGitHub {
@@ -76,6 +75,9 @@ buildGoModule {
     cp LICENSE.md $out/share
   '';
 
+  # disable tests to save time, as it's mostly built by users, not CI
+  doCheck = false;
+
   meta = {
     description = "Shared library for Anytype clients";
     homepage = "https://anytype.io/";
diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index a2d4afef8054..ddfdd44db8b6 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  callPackage,
   runCommand,
   fetchFromGitHub,
   buildNpmPackage,
   pkg-config,
+  anytype-heart,
   libsecret,
   electron,
   makeDesktopItem,
@@ -14,7 +14,6 @@
 }:
 
 let
-  anytype-heart = callPackage ./anytype-heart { };
   pname = "anytype";
   version = "0.45.3";
 
@@ -74,13 +73,20 @@ buildNpmPackage {
     runHook postBuild
   '';
 
+  # remove unnecessary files
+  preInstall = ''
+    npm prune --omit=dev
+    chmod u+w -R dist
+    find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} +
+  '';
+
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/lib/node_modules/anytype
-    cp -r electron.js electron dist node_modules package.json $out/lib/node_modules/anytype/
+    mkdir -p $out/lib/anytype
+    cp -r electron.js electron dist node_modules package.json $out/lib/anytype/
 
-    for icon in $out/lib/node_modules/anytype/electron/img/icons/*.png; do
+    for icon in $out/lib/anytype/electron/img/icons/*.png; do
       mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps"
       ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/anytype.png"
     done
@@ -90,7 +96,7 @@ buildNpmPackage {
     makeWrapper '${lib.getExe electron}' $out/bin/anytype \
       --set-default ELECTRON_IS_DEV 0 \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-      --add-flags $out/lib/node_modules/anytype/ \
+      --add-flags $out/lib/anytype/ \
       --add-flags ${lib.escapeShellArg commandLineArgs}
 
     runHook postInstall
diff --git a/pkgs/by-name/an/anytype/tantivy-go/add-Cargo.lock.patch b/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch
similarity index 100%
rename from pkgs/by-name/an/anytype/tantivy-go/add-Cargo.lock.patch
rename to pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch
diff --git a/pkgs/by-name/an/anytype/tantivy-go/default.nix b/pkgs/by-name/ta/tantivy-go/package.nix
similarity index 100%
rename from pkgs/by-name/an/anytype/tantivy-go/default.nix
rename to pkgs/by-name/ta/tantivy-go/package.nix