diff --git a/hosts/syushiki/home.nix b/hosts/syushiki/home.nix
deleted file mode 100644
index e0424c0..0000000
--- a/hosts/syushiki/home.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ pkgs, userSettings, ... }:
-{
-  imports = [
-    ../../user/dev/tools/git.nix
-    ../../user/dev/tools/gh.nix
-    ../../user/dev/editor/vscodium.nix
-    ../../user/dev/editor/zed-editor.nix
-    ../../user/dev/lang/cc.nix
-    ../../user/dev/lang/python.nix
-    ../../user/dev/lang/rust.nix
-    ../../user/dev/lang/ecmascript.nix
-  ];
-
-  home.username = userSettings.username;
-  home.homeDirectory = "/home/" + userSettings.username;
-
-  programs.home-manager.enable = true;
-
-  home.stateVersion = "24.05";
-
-  home.packages = with pkgs; [];
-}
diff --git a/machines/base.nix b/machines/base.nix
deleted file mode 100644
index 6943b14..0000000
--- a/machines/base.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ pkgs, lib, config, systemSettings, userSettings, ... }:
-{
-  imports = [
-    ../system/hardware/audio.nix
-    ../system/hardware/time.nix
-    ../system/services/network-manager.nix
-    ../system/utils.nix
-  ];
-
-  time.timeZone = systemSettings.timezone;
-
-  networking.hostName = systemSettings.hostname;
-
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  nixpkgs.config.allowUnfree = true;
-
-  i18n.defaultLocale = systemSettings.locale;
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = systemSettings.locale;
-    LC_IDENTIFICATION = systemSettings.locale;
-    LC_MEASUREMENT = systemSettings.locale;
-    LC_MONETARY = systemSettings.locale;
-    LC_NAME = systemSettings.locale;
-    LC_NUMERIC = systemSettings.locale;
-    LC_PAPER = systemSettings.locale;
-    LC_TELEPHONE = systemSettings.locale;
-    LC_TIME = systemSettings.locale;
-  };
-
-  users.users.${userSettings.username} = {
-    isNormalUser = true;
-    description = userSettings.name;
-    extraGroups = [ "networkmanager" "wheel" "docker" "podman" "input" "flatpak" "dialout" "video" "input" "audio" "libvirtd" ];
-    packages = with pkgs; [];
-    uid = 1000;
-  };
-
-  environment.shells = with pkgs; [ bash ];
-  users.defaultUserShell = pkgs.bash;
-}
diff --git a/machines/workstation/configuration.nix b/machines/workstation/configuration.nix
deleted file mode 100644
index 7e4aa3c..0000000
--- a/machines/workstation/configuration.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      ../base.nix
-      ../../system/services/cups.nix
-      ../../system/services/ssh.nix
-      ../../system/services/polkit.nix
-      ../../system/services/flatpak.nix
-      ../../system/services/steam.nix
-      ../../system/services/tailscale.nix
-      ../../system/services/libvirtd.nix
-      ../../system/services/podman.nix
-      ../../system/hardware/kernel.nix
-      ../../system/hardware/nvidia.nix
-      ../../system/hardware/opengl.nix
-      ../../system/hardware/bluetooth.nix
-      ../../system/wm/sddm.nix
-      ../../system/hardware/inputMethods.nix
-      ../../system/env.nix
-    ];
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  programs.appimage = {
-    enable = true;
-    binfmt = true;
-  };
-
-  # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [ 3000 3001 22 ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  system.stateVersion = "24.05"; # Did you read the changelog?
-
-}
-
diff --git a/machines/workstation/hardware-configuration.nix b/machines/workstation/hardware-configuration.nix
deleted file mode 100644
index 86160c4..0000000
--- a/machines/workstation/hardware-configuration.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/f4c95da6-3c6b-4414-a62a-c8c26c4a1c73";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/C83C-841F";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  fileSystems."/run/media/kenryus/hdd" = {
-    device = "/dev/disk/by-uuid/0d146628-12f4-4bb6-abde-bbf798a57c25";
-    fsType = "ext4";
-  };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/d933c349-8e70-41e1-8d13-605656dba18b"; }
-    ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/machines/workstation/home.nix b/machines/workstation/home.nix
deleted file mode 100644
index 3380278..0000000
--- a/machines/workstation/home.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ pkgs, userSettings, ... }:
-{
-  imports = [
-    ../../user/apps/browsers/firefox.nix
-    ../../user/apps/browsers/chromium.nix
-    ../../user/apps/thunderbird.nix
-    ../../user/dev/tools/git.nix
-    ../../user/dev/tools/gitui.nix
-    ../../user/dev/tools/firefox-devedition.nix
-    ../../user/dev/tools/dbeaver-bin.nix
-    ../../user/dev/tools/tldr.nix
-    ../../user/dev/tools/gh.nix
-    ../../user/dev/editor/vscodium.nix
-    ../../user/dev/editor/zed-editor.nix
-    ../../user/dev/lang/cc.nix
-    ../../user/dev/lang/python.nix
-    ../../user/dev/lang/rust.nix
-    ../../user/dev/lang/ecmascript.nix
-    ../../user/dev/ide/qtcreator.nix
-    ../../user/apps/utils/alacritty.nix
-    ../../user/apps/utils/keepassxc.nix
-    #../../user/apps/utils/cava.nix
-    ../../user/apps/utils/owncloud-client.nix
-    ../../user/apps/utils/fzf.nix
-    ../../user/apps/utils/zoxide.nix
-    ../../user/apps/media/vlc.nix
-    ../../user/apps/media/mpv.nix
-    ../../user/apps/media/yt-dlp.nix
-    ../../user/apps/media/kdenlive.nix
-    ../../user/apps/media/obs-studio.nix
-    ../../user/apps/graphics/gimp.nix
-    ../../user/apps/graphics/inkscape.nix
-    ../../user/apps/games/mangohud.nix
-    ../../user/apps/office/texlive.nix
-    #../../user/apps/office/libreoffice-fresh.nix
-    ../../user/shell/bash.nix
-    ../../user/wm/xmonad/xmonad.nix
-  ];
-
-  home.username = userSettings.username;
-  home.homeDirectory = "/home/" + userSettings.username;
-
-  programs.home-manager.enable = true;
-
-  home.stateVersion = "24.05";
-
-  home.packages = with pkgs; [];
-}
diff --git a/pkgs/AppMan/AppMan.nix b/pkgs/AppMan/AppMan.nix
deleted file mode 100644
index 33235d3..0000000
--- a/pkgs/AppMan/AppMan.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  coreutils,
-  gnused,
-  gnugrep,
-  curl,
-  wget,
-  binutils,
-  unzip,
-  gnutar,
-  zsync
-}:
-
-stdenv.mkDerivation rec {
-  pname = "AppMan";
-  version = "7.7";
-
-  src = fetchFromGitHub {
-    owner = "ivan-hc";
-    repo = "AM";
-    rev = "e8abedace64c32023086a9c79fe646d84588a995";
-    hash = "sha256-n0m5VWdMTYWv18cB++NYWMQZXNKWfnj0iHgj0ZNdjy8=";
-  };
-
-  propagatedBuildInputs = [
-    coreutils
-    gnused
-    gnugrep
-    curl
-    wget
-    binutils
-    unzip
-    gnutar
-    zsync
-  ];
-
-  buildPhase = ''
-    
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp APP-MANAGER $out/bin
-    ln -sf $out/bin/APP-MANAGER $out/bin/am
-  '';
-
-  meta = with lib; {
-    description = "Database & solutions for all AppImages and portable apps for GNU/Linux!";
-    longDescription = ''
-      AppImage package manager to install, update (for real) and manage ALL of them (system-wide or locally) thanks to its ever-growing AUR-inspired database listing 2000+ portable apps and programs for GNU/Linux.
-      The first, real centralized repository to manage your AppImages with the ease of APT and the power of PacMan.
-    '';
-    homepage = "https://portable-linux-apps.github.io/";
-    changelog = "https://github.com/ivan-hc/AM/releases/tag/${version}";
-    license = licenses.gpl3;
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/badlion-client/badlion-client.nix b/pkgs/badlion-client/badlion-client.nix
deleted file mode 100644
index a3a431c..0000000
--- a/pkgs/badlion-client/badlion-client.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, fetchurl, appimageTools }:
-
-let
-  pname = "badlion-client";
-  version = "4.4.1";
-
-  src = fetchurl {
-    name = "badlion-client-linux";
-    # https://www.badlion.net/download/client/latest/linux
-    url = "https://client-updates-cdn77.badlion.net/BadlionClient";
-    hash = "sha256-lyu0WQtkevCduGb5Hw5D79CekoHTQiKHvofnqS57mVU=";
-  };
-
-  appimageContents = appimageTools.extract { inherit pname version src; };
-in
-  appimageTools.wrapType2 rec {
-    inherit pname version src;
-
-    extraInstallCommands = ''
-      install -Dm444 ${appimageContents}/BadlionClient.desktop $out/share/applications/BadlionClient.desktop
-      install -Dm444 ${appimageContents}/BadlionClient.png $out/share/pixmaps/BadlionClient.png
-      substituteInPlace $out/share/applications/BadlionClient.desktop \
-        --replace 'Exec=AppRun --no-sandbox %U' 'Exec=badlion-client'
-    '';
-
-    meta = with lib; {
-      description = "Most Complete All-In-One Mod Library for Minecraft with 100+ Mods, FPS Improvements, and more";
-      homepage = "https://client.badlion.net";
-      license = with licenses; [ unfree ];
-      maintainers = [ ];
-      mainProgram = "badlion-client";
-      platforms = [ "x86_64-linux" ];
-    };
-  }
diff --git a/pkgs/badlion-client/default.nix b/pkgs/badlion-client/default.nix
deleted file mode 100644
index 3afd0cf..0000000
--- a/pkgs/badlion-client/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-let
-    pkgs = import <nixpkgs> { };
-in
-    pkgs.callPackage ./badlion-client.nix { }
diff --git a/pkgs/zen-browser/default.nix b/pkgs/zen-browser/default.nix
deleted file mode 100644
index 3f5b27c..0000000
--- a/pkgs/zen-browser/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-let
-  nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-24.11";
-  pkgs = import nixpkgs { config = {}; overlays = []; };
-in
-{
-  zen-browser = pkgs.callPackage ./zen-browser.nix { };
-}
diff --git a/pkgs/zen-browser/zen-browser.nix b/pkgs/zen-browser/zen-browser.nix
deleted file mode 100644
index dc255dd..0000000
--- a/pkgs/zen-browser/zen-browser.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, stdenv, ... }:
-let
-  version = "1.7b";
-in
-stdenv.mkDerivation {
-  pname="zen-browser";
-  inherit version;
-
-  src = fetchTarball {
-    url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen.linux-x86_64.tar.bz2";
-    sha256 = "0aig890fcynxwi7xi8jzd1w2gzg47n0jqfq76wvnkwcam611b2bp";
-  };
-
-  dontPatch = true;
-  dontConfigure = true;
-  dontBuild = true;
-
-  installPhase = ''
-    cp -r . $out
-  '';
-}