From d8cd98fc83058c00892fd2ddda7bae341f0ce266 Mon Sep 17 00:00:00 2001
From: DuckySoLucky <robertkovac160@gmail.com>
Date: Tue, 26 Nov 2024 11:48:27 +0100
Subject: [PATCH 1/6] refactor: project structure changes

---
 .github/workflows/website.yml                 |   2 +-
 .gitmodules                                   |   4 +-
 .vscode/settings.json                         |   7 +-
 src/hooks.server.ts                           |  12 +-
 src/lib/components/AdditionStat.svelte        |   4 +-
 src/lib/components/Bonus.svelte               |   4 +-
 src/lib/components/Chip.svelte                |   2 +-
 src/lib/components/Header.svelte              |   2 +-
 src/lib/components/Item.svelte                |   6 +-
 src/lib/components/Skillbar.svelte            |   6 +-
 src/lib/components/Stat.svelte                |   2 +-
 src/lib/components/Wardrobe.svelte            |   2 +-
 src/lib/constants/NotEnoughUpdates-REPO       |   1 -
 src/lib/constants/constants.ts                |  22 ---
 src/lib/custom_resources.ts                   |   8 +-
 src/lib/index.ts                              |   1 -
 src/lib/layouts/stats/AdditionalStats.svelte  |   4 +-
 src/lib/layouts/stats/Items.svelte            |   2 +-
 src/lib/layouts/stats/Main.svelte             |   2 +-
 src/lib/layouts/stats/PlayerProfile.svelte    |   4 +-
 src/lib/layouts/stats/Skills.svelte           |   2 +-
 src/lib/layouts/stats/Stats.svelte            |   4 +-
 src/lib/renderer.ts                           |   4 +-
 src/lib/sections/stats/Accessories.svelte     |   4 +-
 src/lib/sections/stats/Armor.svelte           |   6 +-
 src/lib/sections/stats/Bestiary.svelte        |   4 +-
 src/lib/sections/stats/Collections.svelte     |   5 +-
 src/lib/sections/stats/CrimsonIsle.svelte     |   7 +-
 src/lib/sections/stats/Dungeons.svelte        |   4 +-
 src/lib/sections/stats/Inventory.svelte       |   2 +-
 src/lib/sections/stats/Minions.svelte         |   4 +-
 src/lib/sections/stats/MiscSection.svelte     |   3 +-
 src/lib/sections/stats/Pets.svelte            |  37 ++--
 src/lib/sections/stats/Rift.svelte            |   4 +-
 src/lib/sections/stats/Slayer.svelte          |   2 +-
 src/lib/sections/stats/Weapons.svelte         |   2 +-
 src/lib/sections/stats/misc/auctions.svelte   |   2 +-
 src/lib/sections/stats/misc/claimed.svelte    |   2 +-
 src/lib/sections/stats/misc/damage.svelte     |   2 +-
 src/lib/sections/stats/misc/dragons.svelte    |   2 +-
 src/lib/sections/stats/misc/endstone.svelte   |   2 +-
 src/lib/sections/stats/misc/essence.svelte    |   4 +-
 src/lib/sections/stats/misc/gifts.svelte      |   2 +-
 src/lib/sections/stats/misc/jerry.svelte      |   2 +-
 src/lib/sections/stats/misc/kills.svelte      |   2 +-
 .../sections/stats/misc/mythological.svelte   |   2 +-
 src/lib/sections/stats/misc/pet.svelte        |   2 +-
 src/lib/sections/stats/misc/potions.svelte    |   2 +-
 src/lib/sections/stats/misc/races.svelte      |   4 +-
 .../sections/stats/misc/uncategorized.svelte  |   8 +-
 src/lib/sections/stats/misc/upgrades.svelte   |   2 +-
 .../sections/stats/skills/enchanting.svelte   |   2 +-
 src/lib/sections/stats/skills/farming.svelte  |   6 +-
 src/lib/sections/stats/skills/fishing.svelte  |   6 +-
 src/lib/sections/stats/skills/mining.svelte   |   6 +-
 .../server/constants/NotEnoughUpdates-REPO    |   1 +
 src/lib/{ => server}/constants/accessories.ts |   2 +-
 src/lib/{ => server}/constants/armor.ts       |   0
 src/lib/{ => server}/constants/collections.ts |   0
 src/lib/server/constants/constants.ts         |  21 ++
 .../{ => server}/constants/crimson_isle.ts    |   0
 src/lib/{ => server}/constants/dungeons.ts    |   0
 src/lib/{ => server}/constants/enchanting.ts  |   0
 src/lib/{ => server}/constants/error.ts       |   0
 src/lib/{ => server}/constants/farming.ts     |   0
 src/lib/{ => server}/constants/fishing.ts     |   0
 src/lib/{ => server}/constants/gemstones.ts   |   0
 src/lib/{ => server}/constants/mining.ts      |  48 ++---
 src/lib/{ => server}/constants/minions.ts     |   0
 src/lib/{ => server}/constants/misc.ts        |   0
 src/lib/{ => server}/constants/mobs.ts        |   0
 src/lib/{ => server}/constants/pets.ts        |   0
 src/lib/{ => server}/constants/ranks.ts       |   0
 src/lib/{ => server}/constants/rift.ts        |   0
 src/lib/{ => server}/constants/skills.ts      |   0
 src/lib/{ => server}/constants/skins.ts       |   0
 src/lib/{ => server}/constants/slayer.ts      |   0
 src/lib/{ => server}/constants/trophy_fish.ts |   2 +-
 .../server/constants/update-collections.ts    |   2 +-
 src/lib/server/constants/update-items.ts      |   4 +-
 src/lib/server/db/mongo/update-collections.ts |   2 +-
 src/lib/{ => server}/helper.ts                |  69 +++++--
 .../helper/NotEnoughUpdates}/NBTParser.ts     |   0
 .../NotEnoughUpdates}/parseNEURepository.ts   |  18 +-
 .../NotEnoughUpdates/parsers}/bestiary.ts     |   2 +-
 .../NotEnoughUpdates}/updateNEURepository.ts  |   2 +-
 src/lib/{ => server}/helper/cache.ts          |   0
 src/lib/{ => server/helper}/hashes.ts         |   0
 src/lib/{ => server}/helper/item.ts           |   0
 src/lib/server/lib.ts                         |   2 +-
 src/lib/server/{lib => }/stats.ts             |   0
 src/lib/server/stats/accessories.ts           |   6 +-
 src/lib/{ => server}/stats/bestiary.ts        |   2 +-
 src/lib/{ => server}/stats/collections.ts     |   4 +-
 src/lib/{ => server}/stats/crimson_isle.ts    |   4 +-
 src/lib/{ => server}/stats/dungeons.ts        |   4 +-
 src/lib/{ => server}/stats/enchanting.ts      |   2 +-
 src/lib/{ => server}/stats/farming.ts         |   2 +-
 src/lib/{ => server}/stats/fishing.ts         |   4 +-
 src/lib/{ => server}/stats/hotm.ts            |   6 +-
 src/lib/{ => server}/stats/items.ts           |   8 +-
 src/lib/{ => server}/stats/items/armor.ts     |   4 +-
 src/lib/{ => server}/stats/items/category.ts  |   4 +-
 src/lib/{ => server}/stats/items/equipment.ts |   2 +-
 src/lib/server/stats/items/processing.ts      |  16 +-
 src/lib/{ => server}/stats/items/stats.ts     |  11 +-
 src/lib/{ => server}/stats/items/wardrobe.ts  |   2 +-
 .../{ => server}/stats/leveling/leveling.ts   |   2 +-
 src/lib/{ => server}/stats/main_stats.ts      |   4 +-
 src/lib/{ => server}/stats/mining.ts          |   4 +-
 src/lib/{ => server}/stats/minions.ts         |   4 +-
 src/lib/{ => server}/stats/misc.ts            |   4 +-
 src/lib/{ => server}/stats/missing.ts         |   7 +-
 src/lib/{ => server}/stats/pets.ts            |  17 +-
 src/lib/{ => server}/stats/rank.ts            |   2 +-
 src/lib/{ => server}/stats/rift.ts            |   2 +-
 src/lib/{ => server}/stats/skills.ts          |   2 +-
 src/lib/{ => server}/stats/skyblock_level.ts  |   0
 src/lib/{ => server}/stats/slayer.ts          |   9 +-
 src/lib/server/stats/stats.ts                 |  36 ++--
 .../{ => shared}/constants/enchantments.ts    |   0
 src/lib/{ => shared}/constants/items.ts       |   0
 src/lib/{ => shared}/constants/stats.ts       |   0
 src/lib/shared/helper.ts                      | 187 ++++++++++++++++++
 src/lib/{stats => shared}/player_stats.ts     |   2 +-
 src/lib/{ => shared}/utils.ts                 |   0
 src/lib/tools/formatting.ts                   | 119 -----------
 src/lib/tools/helper.ts                       | 127 ------------
 src/lib/tools/index.ts                        |   2 -
 src/{ => lib}/types/custom-resources.d.ts     |   0
 src/{ => lib}/types/global.d.ts               |   0
 src/lib/types/helper.d.ts                     |   2 +
 .../NotEnoughUpdates/NotEnoughUpdates.d.ts    |   0
 .../processed/NotEnoughUpdates/bestiary.d.ts  |   0
 .../types/processed/profile/bestiary.d.ts     |   0
 .../types/processed/profile/collections.d.ts  |   0
 .../types/processed/profile/crimson_isle.d.ts |   1 -
 .../types/processed/profile/dungeons.d.ts     |   0
 .../types/processed/profile/enchanting.d.ts   |   0
 .../types/processed/profile/farming.d.ts      |   0
 .../types/processed/profile/fishing.d.ts      |   0
 .../types/processed/profile/items.d.ts        |   0
 .../types/processed/profile/main_stats.d.ts   |   0
 .../types/processed/profile/mining.d.ts       |   0
 .../types/processed/profile/minions.d.ts      |   0
 .../types/processed/profile/misc.d.ts         |   0
 .../types/processed/profile/pet-stats.d.ts    |   0
 .../types/processed/profile/pets.d.ts         |   0
 .../types/processed/profile/rank.d.ts         |   0
 .../types/processed/profile/rift.d.ts         |   0
 .../types/processed/profile/skills.d.ts       |   0
 .../types/processed/profile/slayer.d.ts       |   0
 .../types/processed/profile/stats.d.ts        |   0
 .../types/raw/NotEnoughUpdates/bestiary.d.ts  |   0
 src/{ => lib}/types/raw/player/lib.d.ts       |   0
 src/{ => lib}/types/raw/profile/lib.d.ts      |   0
 src/{ => lib}/types/stats.d.ts                |   0
 .../api/stats/[paramPlayer=player]/+server.ts |   6 +-
 .../[paramProfile]/+server.ts                 |   6 +-
 svelte.config.js                              |   4 +-
 160 files changed, 515 insertions(+), 541 deletions(-)
 delete mode 160000 src/lib/constants/NotEnoughUpdates-REPO
 delete mode 100644 src/lib/constants/constants.ts
 delete mode 100644 src/lib/index.ts
 create mode 160000 src/lib/server/constants/NotEnoughUpdates-REPO
 rename src/lib/{ => server}/constants/accessories.ts (99%)
 rename src/lib/{ => server}/constants/armor.ts (100%)
 rename src/lib/{ => server}/constants/collections.ts (100%)
 create mode 100644 src/lib/server/constants/constants.ts
 rename src/lib/{ => server}/constants/crimson_isle.ts (100%)
 rename src/lib/{ => server}/constants/dungeons.ts (100%)
 rename src/lib/{ => server}/constants/enchanting.ts (100%)
 rename src/lib/{ => server}/constants/error.ts (100%)
 rename src/lib/{ => server}/constants/farming.ts (100%)
 rename src/lib/{ => server}/constants/fishing.ts (100%)
 rename src/lib/{ => server}/constants/gemstones.ts (100%)
 rename src/lib/{ => server}/constants/mining.ts (92%)
 rename src/lib/{ => server}/constants/minions.ts (100%)
 rename src/lib/{ => server}/constants/misc.ts (100%)
 rename src/lib/{ => server}/constants/mobs.ts (100%)
 rename src/lib/{ => server}/constants/pets.ts (100%)
 rename src/lib/{ => server}/constants/ranks.ts (100%)
 rename src/lib/{ => server}/constants/rift.ts (100%)
 rename src/lib/{ => server}/constants/skills.ts (100%)
 rename src/lib/{ => server}/constants/skins.ts (100%)
 rename src/lib/{ => server}/constants/slayer.ts (100%)
 rename src/lib/{ => server}/constants/trophy_fish.ts (99%)
 rename src/lib/{ => server}/helper.ts (86%)
 rename src/lib/{scripts => server/helper/NotEnoughUpdates}/NBTParser.ts (100%)
 rename src/lib/{scripts => server/helper/NotEnoughUpdates}/parseNEURepository.ts (52%)
 rename src/lib/{scripts/NotEnoughUpdates => server/helper/NotEnoughUpdates/parsers}/bestiary.ts (97%)
 rename src/lib/{scripts => server/helper/NotEnoughUpdates}/updateNEURepository.ts (89%)
 rename src/lib/{ => server}/helper/cache.ts (100%)
 rename src/lib/{ => server/helper}/hashes.ts (100%)
 rename src/lib/{ => server}/helper/item.ts (100%)
 rename src/lib/server/{lib => }/stats.ts (100%)
 rename src/lib/{ => server}/stats/bestiary.ts (97%)
 rename src/lib/{ => server}/stats/collections.ts (97%)
 rename src/lib/{ => server}/stats/crimson_isle.ts (89%)
 rename src/lib/{ => server}/stats/dungeons.ts (98%)
 rename src/lib/{ => server}/stats/enchanting.ts (95%)
 rename src/lib/{ => server}/stats/farming.ts (98%)
 rename src/lib/{ => server}/stats/fishing.ts (95%)
 rename src/lib/{ => server}/stats/hotm.ts (96%)
 rename src/lib/{ => server}/stats/items.ts (94%)
 rename src/lib/{ => server}/stats/items/armor.ts (96%)
 rename src/lib/{ => server}/stats/items/category.ts (96%)
 rename src/lib/{ => server}/stats/items/equipment.ts (91%)
 rename src/lib/{ => server}/stats/items/stats.ts (77%)
 rename src/lib/{ => server}/stats/items/wardrobe.ts (93%)
 rename src/lib/{ => server}/stats/leveling/leveling.ts (99%)
 rename src/lib/{ => server}/stats/main_stats.ts (96%)
 rename src/lib/{ => server}/stats/mining.ts (97%)
 rename src/lib/{ => server}/stats/minions.ts (96%)
 rename src/lib/{ => server}/stats/misc.ts (98%)
 rename src/lib/{ => server}/stats/missing.ts (96%)
 rename src/lib/{ => server}/stats/pets.ts (94%)
 rename src/lib/{ => server}/stats/rank.ts (100%)
 rename src/lib/{ => server}/stats/rift.ts (96%)
 rename src/lib/{ => server}/stats/skills.ts (100%)
 rename src/lib/{ => server}/stats/skyblock_level.ts (100%)
 rename src/lib/{ => server}/stats/slayer.ts (87%)
 rename src/lib/{ => shared}/constants/enchantments.ts (100%)
 rename src/lib/{ => shared}/constants/items.ts (100%)
 rename src/lib/{ => shared}/constants/stats.ts (100%)
 create mode 100644 src/lib/shared/helper.ts
 rename src/lib/{stats => shared}/player_stats.ts (98%)
 rename src/lib/{ => shared}/utils.ts (100%)
 delete mode 100644 src/lib/tools/formatting.ts
 delete mode 100644 src/lib/tools/helper.ts
 delete mode 100644 src/lib/tools/index.ts
 rename src/{ => lib}/types/custom-resources.d.ts (100%)
 rename src/{ => lib}/types/global.d.ts (100%)
 create mode 100644 src/lib/types/helper.d.ts
 rename src/{ => lib}/types/processed/NotEnoughUpdates/NotEnoughUpdates.d.ts (100%)
 rename src/{ => lib}/types/processed/NotEnoughUpdates/bestiary.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/bestiary.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/collections.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/crimson_isle.d.ts (94%)
 rename src/{ => lib}/types/processed/profile/dungeons.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/enchanting.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/farming.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/fishing.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/items.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/main_stats.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/mining.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/minions.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/misc.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/pet-stats.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/pets.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/rank.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/rift.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/skills.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/slayer.d.ts (100%)
 rename src/{ => lib}/types/processed/profile/stats.d.ts (100%)
 rename src/{ => lib}/types/raw/NotEnoughUpdates/bestiary.d.ts (100%)
 rename src/{ => lib}/types/raw/player/lib.d.ts (100%)
 rename src/{ => lib}/types/raw/profile/lib.d.ts (100%)
 rename src/{ => lib}/types/stats.d.ts (100%)

diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
index 60b97cfc..c75be410 100644
--- a/.github/workflows/website.yml
+++ b/.github/workflows/website.yml
@@ -97,7 +97,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: NotEnoughUpdates/NotEnoughUpdates-REPO
-          path: src/lib/constants/NotEnoughUpdates-REPO/items
+          path: src/lib/server/constants/NotEnoughUpdates-REPO/items
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: PNPM Install
diff --git a/.gitmodules b/.gitmodules
index 5ed9afa6..183a6ea1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "src/lib/constants/NotEnoughUpdates-REPO"]
-	path = src/lib/constants/NotEnoughUpdates-REPO
+[submodule "src/lib/constants/server/NotEnoughUpdates-REPO"]
+	path = src/lib/constants/server/NotEnoughUpdates-REPO
 	url = https://github.com/NotEnoughUpdates/NotEnoughUpdates-REPO
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 32821d0d..51077165 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,8 +2,7 @@
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll": "always",
-    "source.organizeImports": "explicit"
+    "source.fixAll": "always"
   },
   "files.associations": {
     "*.css": "tailwindcss",
@@ -21,7 +20,7 @@
     "typescript": "typescript",
     "svelte": "html"
   },
-  "javascript.updateImportsOnFileMove.enabled": "prompt",
-  "typescript.updateImportsOnFileMove.enabled": "prompt",
+  "javascript.updateImportsOnFileMove.enabled": "always",
+  "typescript.updateImportsOnFileMove.enabled": "always",
   "eslint.validate": ["javascript", "typescript", "svelte"]
 }
diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index a1376ca8..bd627255 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -1,11 +1,11 @@
-import { startMongo } from "./lib/server/db/mongo";
-import { startRedis } from "./lib/server/db/redis";
 import { init } from "$lib/custom_resources";
-import { parseNEURepository } from "$lib/scripts/parseNEURepository";
-import { updateNotEnoughUpdatesRepository } from "$lib/scripts/updateNEURepository";
-import { getPrices } from "skyhelper-networth";
-import { updateItems } from "$lib/server/constants/update-items";
 import { updateCollections } from "$lib/server/constants/update-collections";
+import { updateItems } from "$lib/server/constants/update-items";
+import { parseNEURepository } from "$lib/server/helper/NotEnoughUpdates/parseNEURepository";
+import { updateNotEnoughUpdatesRepository } from "$lib/server/helper/NotEnoughUpdates/updateNEURepository";
+import { getPrices } from "skyhelper-networth";
+import { startMongo } from "./lib/server/db/mongo";
+import { startRedis } from "./lib/server/db/redis";
 
 init();
 
diff --git a/src/lib/components/AdditionStat.svelte b/src/lib/components/AdditionStat.svelte
index f56bf7fd..77e6e87c 100644
--- a/src/lib/components/AdditionStat.svelte
+++ b/src/lib/components/AdditionStat.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { RARITY_COLORS } from "$constants/items";
-  import { cn, flyAndScale } from "$lib/utils";
+  import { RARITY_COLORS } from "$lib/shared/constants/items";
+  import { cn, flyAndScale } from "$lib/shared/utils";
   import { Tooltip } from "bits-ui";
 
   export let text: string;
diff --git a/src/lib/components/Bonus.svelte b/src/lib/components/Bonus.svelte
index bef36b52..2e78697c 100644
--- a/src/lib/components/Bonus.svelte
+++ b/src/lib/components/Bonus.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { STATS_DATA } from "$constants/stats";
-  import { cn } from "$lib/utils";
+  import { STATS_DATA } from "$lib/shared/constants/stats";
+  import { cn } from "$lib/shared/utils";
 
   export let stats;
   export let title = "Bonus:";
diff --git a/src/lib/components/Chip.svelte b/src/lib/components/Chip.svelte
index e8dec23a..040e7572 100644
--- a/src/lib/components/Chip.svelte
+++ b/src/lib/components/Chip.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { cn, flyAndScale } from "$lib/utils";
+  import { cn, flyAndScale } from "$lib/shared/utils";
   import { Avatar, Tooltip } from "bits-ui";
   import Image from "lucide-svelte/icons/image";
   import { fade } from "svelte/transition";
diff --git a/src/lib/components/Header.svelte b/src/lib/components/Header.svelte
index 9150a659..c0925fb8 100644
--- a/src/lib/components/Header.svelte
+++ b/src/lib/components/Header.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { flyAndScale } from "$lib/utils";
+  import { flyAndScale } from "$lib/shared/utils";
   import { Button, Popover } from "bits-ui";
   import PackageOpen from "lucide-svelte/icons/package-open";
   import PaintBucket from "lucide-svelte/icons/paint-bucket";
diff --git a/src/lib/components/Item.svelte b/src/lib/components/Item.svelte
index ee68895f..ac15afb2 100644
--- a/src/lib/components/Item.svelte
+++ b/src/lib/components/Item.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { page } from "$app/stores";
-  import { getRarityClass, isEnchanted, removeFormatting, renderLore } from "$lib/tools";
-  import { cn, flyAndScale } from "$lib/utils";
-  import type { ProcessedItem, ProcessedPet } from "$types/global";
+  import { getRarityClass, isEnchanted, removeFormatting, renderLore } from "$lib/shared/helper";
+  import { cn, flyAndScale } from "$lib/shared/utils";
+  import type { ProcessedItem, ProcessedPet } from "$lib/types/global";
   import { Avatar, Tooltip } from "bits-ui";
   import Image from "lucide-svelte/icons/image";
 
diff --git a/src/lib/components/Skillbar.svelte b/src/lib/components/Skillbar.svelte
index 9a70a3b5..0297732a 100644
--- a/src/lib/components/Skillbar.svelte
+++ b/src/lib/components/Skillbar.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import { formatNumber } from "$lib/tools";
-  import { cn, flyAndScale } from "$lib/utils";
-  import type { Skill } from "$types/global";
+  import { formatNumber } from "$lib/shared/helper";
+  import { cn, flyAndScale } from "$lib/shared/utils";
+  import type { Skill } from "$lib/types/global";
   import { Avatar, Progress, Tooltip } from "bits-ui";
   import BarChartHorizontal from "lucide-svelte/icons/bar-chart-horizontal";
   import { format } from "numerable";
diff --git a/src/lib/components/Stat.svelte b/src/lib/components/Stat.svelte
index 28967aa1..0489a772 100644
--- a/src/lib/components/Stat.svelte
+++ b/src/lib/components/Stat.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { cn, flyAndScale } from "$lib/utils";
+  import { cn, flyAndScale } from "$lib/shared/utils";
   import { Tooltip } from "bits-ui";
   import { format } from "numerable";
 
diff --git a/src/lib/components/Wardrobe.svelte b/src/lib/components/Wardrobe.svelte
index eade9c35..2f896c0a 100644
--- a/src/lib/components/Wardrobe.svelte
+++ b/src/lib/components/Wardrobe.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import Item from "$lib/components/Item.svelte";
-  import type { ProcessedItem } from "$types/global";
+  import type { ProcessedItem } from "$lib/types/global";
   import { Collapsible } from "bits-ui";
   import { writable } from "svelte/store";
   import { slide } from "svelte/transition";
diff --git a/src/lib/constants/NotEnoughUpdates-REPO b/src/lib/constants/NotEnoughUpdates-REPO
deleted file mode 160000
index 5ad539f7..00000000
--- a/src/lib/constants/NotEnoughUpdates-REPO
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5ad539f7d6b791e9fa2695a32b446d349829c760
diff --git a/src/lib/constants/constants.ts b/src/lib/constants/constants.ts
deleted file mode 100644
index fb57e957..00000000
--- a/src/lib/constants/constants.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export * from "$constants/accessories";
-export * from "$constants/armor";
-export * from "$constants/collections";
-export * from "$constants/crimson_isle";
-export * from "$constants/dungeons";
-export * from "$constants/enchanting";
-export * from "$constants/farming";
-export * from "$constants/fishing";
-export * from "$constants/gemstones";
-export * from "$constants/items";
-export * from "$constants/mining";
-export * from "$constants/minions";
-export * from "$constants/misc";
-export * from "$constants/mobs";
-export * from "$constants/pets";
-export * from "$constants/ranks";
-export * from "$constants/rift";
-export * from "$constants/skills";
-export * from "$constants/skins";
-export * from "$constants/slayer";
-export * from "$constants/stats";
-export * from "$constants/trophy_fish";
diff --git a/src/lib/custom_resources.ts b/src/lib/custom_resources.ts
index 6dbc3e29..e6da066b 100644
--- a/src/lib/custom_resources.ts
+++ b/src/lib/custom_resources.ts
@@ -8,7 +8,7 @@ import path from "path";
 import RJSON from "relaxed-json";
 import UPNG from "upng-js";
 import util from "util";
-import { getCacheFilePath, getCacheFolderPath, getFolderPath, getId, getPath, getTextureValue, hasPath } from "./helper";
+import { getCacheFilePath, getCacheFolderPath, getFolderPath, getId, getPath, getTextureValue, hasPath } from "./server/helper";
 const mcData = minecraftData("1.8.9");
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -18,7 +18,7 @@ import apng2gif from "apng2gif-bin";
 // @ts-ignore
 import sharp from "sharp";
 
-import { getFileHash } from "$lib/hashes";
+import { getFileHash } from "$lib/server/helper/hashes";
 import type { ItemTexture, OutputResourcePack, OutputTexture, ResourcePack, TextureAnimation, TextureModel } from "$types/custom-resources";
 import type { Item, ProcessedItem, getTextureParams } from "$types/processed/profile/items";
 import child_process from "child_process";
@@ -327,6 +327,8 @@ async function loadResourcePacks() {
           continue;
         }
 
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-expect-error
         const decode = UPNG.decode(imageData);
         if (decode == null) {
           continue;
@@ -511,6 +513,8 @@ async function loadResourcePacks() {
         }
 
         if (pngFrames.length > 0) {
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-expect-error
           const apng = UPNG.encode(pngFrames, NORMALIZED_SIZE, NORMALIZED_SIZE, 0, pngDelays);
 
           await fs.writeFile(textureFile, Buffer.from(apng));
diff --git a/src/lib/index.ts b/src/lib/index.ts
deleted file mode 100644
index 856f2b6c..00000000
--- a/src/lib/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-// place files you want to import through the `$lib` alias in this folder.
diff --git a/src/lib/layouts/stats/AdditionalStats.svelte b/src/lib/layouts/stats/AdditionalStats.svelte
index 97a79860..49ac5608 100644
--- a/src/lib/layouts/stats/AdditionalStats.svelte
+++ b/src/lib/layouts/stats/AdditionalStats.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
-  import { formatNumber } from "$lib/tools";
-  import type { Stats as StatsType } from "$types/stats";
+  import { formatNumber } from "$lib/shared/helper";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format as dateFormat, formatDistanceToNowStrict } from "date-fns";
   import { format as numberFormat } from "numerable";
   import { getContext } from "svelte";
diff --git a/src/lib/layouts/stats/Items.svelte b/src/lib/layouts/stats/Items.svelte
index 0a99c950..131ae1ba 100644
--- a/src/lib/layouts/stats/Items.svelte
+++ b/src/lib/layouts/stats/Items.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { cn } from "$lib/utils";
+  import { cn } from "$lib/shared/utils";
 
   export let title: string | undefined = undefined;
   export let subtitle: string | undefined = undefined;
diff --git a/src/lib/layouts/stats/Main.svelte b/src/lib/layouts/stats/Main.svelte
index e180c010..99b80bfd 100644
--- a/src/lib/layouts/stats/Main.svelte
+++ b/src/lib/layouts/stats/Main.svelte
@@ -17,7 +17,7 @@
   import SkillsSection from "$lib/sections/stats/SkillsSection.svelte";
   import Slayer from "$lib/sections/stats/Slayer.svelte";
   import Weapons from "$lib/sections/stats/Weapons.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { setContext } from "svelte";
 
   export let profile;
diff --git a/src/lib/layouts/stats/PlayerProfile.svelte b/src/lib/layouts/stats/PlayerProfile.svelte
index dc2f7f13..10a8c88e 100644
--- a/src/lib/layouts/stats/PlayerProfile.svelte
+++ b/src/lib/layouts/stats/PlayerProfile.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import type { Stats as StatsType } from "$types/stats";
-  import { flyAndScale } from "$lib/utils";
+  import { flyAndScale } from "$lib/shared/utils";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { Button, DropdownMenu } from "bits-ui";
   import ChevronRight from "lucide-svelte/icons/chevron-right";
   import ExternalLink from "lucide-svelte/icons/external-link";
diff --git a/src/lib/layouts/stats/Skills.svelte b/src/lib/layouts/stats/Skills.svelte
index 674424ea..dce69856 100644
--- a/src/lib/layouts/stats/Skills.svelte
+++ b/src/lib/layouts/stats/Skills.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import Skillbar from "$lib/components/Skillbar.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { getContext } from "svelte";
 
   const profile = getContext<StatsType>("profile");
diff --git a/src/lib/layouts/stats/Stats.svelte b/src/lib/layouts/stats/Stats.svelte
index 3056ce7e..6ca16e2e 100644
--- a/src/lib/layouts/stats/Stats.svelte
+++ b/src/lib/layouts/stats/Stats.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import Stat from "$lib/components/Stat.svelte";
-  import { getPlayerStats } from "$lib/stats/player_stats";
-  import type { Stats as StatsType } from "$types/stats";
+  import { getPlayerStats } from "$lib/shared/player_stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
 
   import { getContext } from "svelte";
 
diff --git a/src/lib/renderer.ts b/src/lib/renderer.ts
index 1147441c..96f95a06 100644
--- a/src/lib/renderer.ts
+++ b/src/lib/renderer.ts
@@ -18,8 +18,8 @@ import path from "path";
 
 import type { ItemQuery } from "$types/global";
 import minecraftData from "minecraft-data";
-import * as helper from "./helper";
-import { getItemData } from "./helper/item";
+import * as helper from "./server/helper";
+import { getItemData } from "./server/helper/item";
 const mcData = minecraftData("1.8.9");
 
 const skewA = 26 / 45;
diff --git a/src/lib/sections/stats/Accessories.svelte b/src/lib/sections/stats/Accessories.svelte
index ed557b98..791955fe 100644
--- a/src/lib/sections/stats/Accessories.svelte
+++ b/src/lib/sections/stats/Accessories.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-  import { RARITY_COLORS } from "$constants/items";
+  import { RARITY_COLORS } from "$lib/shared/constants/items";
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Bonus from "$lib/components/Bonus.svelte";
   import Item from "$lib/components/Item.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { Collapsible } from "bits-ui";
   import { getContext } from "svelte";
 
diff --git a/src/lib/sections/stats/Armor.svelte b/src/lib/sections/stats/Armor.svelte
index 94522bb2..03040bef 100644
--- a/src/lib/sections/stats/Armor.svelte
+++ b/src/lib/sections/stats/Armor.svelte
@@ -3,9 +3,9 @@
   import Item from "$lib/components/Item.svelte";
   import Wardrobe from "$lib/components/Wardrobe.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import { getRarityClass } from "$lib/tools";
-  import { cn } from "$lib/utils";
-  import type { Stats as StatsType } from "$types/stats";
+  import { getRarityClass } from "$lib/shared/helper";
+  import { cn } from "$lib/shared/utils";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { getContext } from "svelte";
 
   const profile = getContext<StatsType>("profile");
diff --git a/src/lib/sections/stats/Bestiary.svelte b/src/lib/sections/stats/Bestiary.svelte
index c4139260..92af5997 100644
--- a/src/lib/sections/stats/Bestiary.svelte
+++ b/src/lib/sections/stats/Bestiary.svelte
@@ -2,8 +2,8 @@
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Chip from "$lib/components/Chip.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import { cn } from "$lib/utils";
-  import type { Stats as StatsType } from "$types/stats";
+  import { cn } from "$lib/shared/utils";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
 
diff --git a/src/lib/sections/stats/Collections.svelte b/src/lib/sections/stats/Collections.svelte
index 4b8df0f1..e5496133 100644
--- a/src/lib/sections/stats/Collections.svelte
+++ b/src/lib/sections/stats/Collections.svelte
@@ -2,8 +2,9 @@
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Chip from "$lib/components/Chip.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import { cn } from "$lib/utils";
-  import type { Stats as StatsType } from "$types/stats";
+  import { cn } from "$lib/shared/utils";
+
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
 
diff --git a/src/lib/sections/stats/CrimsonIsle.svelte b/src/lib/sections/stats/CrimsonIsle.svelte
index f8cada97..c958c047 100644
--- a/src/lib/sections/stats/CrimsonIsle.svelte
+++ b/src/lib/sections/stats/CrimsonIsle.svelte
@@ -2,8 +2,9 @@
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Chip from "$lib/components/Chip.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import { cn } from "$lib/utils";
-  import type { Stats as StatsType } from "$types/stats";
+  import { formatTime } from "$lib/shared/helper";
+  import { cn } from "$lib/shared/utils";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
 
@@ -68,7 +69,7 @@
                 </div>
                 <div class="text-sm">
                   <span class="opacity-60">Time:</span>
-                  <span class="text-text">{challenge.formattedTime}</span>
+                  <span class="text-text">{formatTime(challenge.time)}</span>
                 </div>
               </div>
             </div>
diff --git a/src/lib/sections/stats/Dungeons.svelte b/src/lib/sections/stats/Dungeons.svelte
index 41880552..d636d369 100644
--- a/src/lib/sections/stats/Dungeons.svelte
+++ b/src/lib/sections/stats/Dungeons.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Skillbar from "$lib/components/Skillbar.svelte";
-  import { formatNumber } from "$lib/tools";
-  import type { Stats as StatsType } from "$types/stats";
+  import { formatNumber } from "$lib/shared/helper";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { Avatar, Collapsible } from "bits-ui";
   import { formatDate, formatDistanceToNowStrict } from "date-fns";
   import ChevronDown from "lucide-svelte/icons/chevron-down";
diff --git a/src/lib/sections/stats/Inventory.svelte b/src/lib/sections/stats/Inventory.svelte
index 759d2447..95b5a41f 100644
--- a/src/lib/sections/stats/Inventory.svelte
+++ b/src/lib/sections/stats/Inventory.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import Item from "$lib/components/Item.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { Avatar, Tabs } from "bits-ui";
   import Image from "lucide-svelte/icons/image";
   import { getContext } from "svelte";
diff --git a/src/lib/sections/stats/Minions.svelte b/src/lib/sections/stats/Minions.svelte
index 9611d30b..43387e67 100644
--- a/src/lib/sections/stats/Minions.svelte
+++ b/src/lib/sections/stats/Minions.svelte
@@ -2,8 +2,8 @@
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Chip from "$lib/components/Chip.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import { cn } from "$lib/utils";
-  import type { Stats as StatsType } from "$types/stats";
+  import { cn } from "$lib/shared/utils";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { getContext } from "svelte";
 
   const profile = getContext<StatsType>("profile");
diff --git a/src/lib/sections/stats/MiscSection.svelte b/src/lib/sections/stats/MiscSection.svelte
index 467c8b8c..70fe3417 100644
--- a/src/lib/sections/stats/MiscSection.svelte
+++ b/src/lib/sections/stats/MiscSection.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { getContext, setContext } from "svelte";
   import Auctions from "./misc/auctions.svelte";
   import Claimed from "./misc/claimed.svelte";
@@ -20,7 +20,6 @@
   const profile = getContext<StatsType>("profile");
 
   setContext("misc", profile.misc);
-  console.log(profile.misc);
 </script>
 
 <h3 class="text-2xl capitalize">Miscellaneous</h3>
diff --git a/src/lib/sections/stats/Pets.svelte b/src/lib/sections/stats/Pets.svelte
index 05dcccb4..d23fcd09 100644
--- a/src/lib/sections/stats/Pets.svelte
+++ b/src/lib/sections/stats/Pets.svelte
@@ -1,25 +1,31 @@
 <script lang="ts">
-  import { RARITY_COLORS } from "$constants/items";
+  import { RARITY_COLORS } from "$lib/shared/constants/items";
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Bonus from "$lib/components/Bonus.svelte";
   import Item from "$lib/components/Item.svelte";
-  import { PET_REWARDS } from "$lib/constants/pets";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  // import { PET_REWARDS } from "$lib/server/constants/pets";
+  /*
+  <!-- TODO: Format this on the back end -->
+  {#each Object.entries(PET_REWARDS) as [score, data]}
+    <div>
+      {score} Score: <span style="color: var(--§b)">+{data.magic_find} Magic Find</span>
+      {#if data.magic_find === pets.petScore.amount}
+        <span style="color: var(--§5);"> «</span>
+      {/if}
+    </div>
+  {/each}
+  */
+
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { Collapsible } from "bits-ui";
   import { getContext } from "svelte";
+  import { uniqBy } from "$lib/shared/helper";
   //import { formatNumber } from "$lib/helper";
 
   const profile = getContext<StatsType>("profile");
 
   // TODO: Once helper functions get moved to a global location, we can remove this function
-  function uniqBy<T>(arr: T[], key: string) {
-    const seen = new Set();
-    return arr.filter((item) => {
-      const k = (item as Record<string, unknown>)[key];
-      return seen.has(k) ? false : seen.add(k);
-    });
-  }
 
   const pets = profile.pets;
 </script>
@@ -32,16 +38,7 @@
       <div class="max-w-xs space-y-6 font-bold">
         <h3 class="text-text/85">Pet score is calculated based on how many unique pets you have and the rarity of these pets.</h3>
         <h3 class="text-text/85">You gain an additional score for each max level pet you have!</h3>
-        <div class="flex flex-col">
-          {#each Object.entries(PET_REWARDS) as [score, data]}
-            <div>
-              {score} Score: <span style="color: var(--§b)">+{data.magic_find} Magic Find</span>
-              {#if data.magic_find === pets.petScore.amount}
-                <span style="color: var(--§5);"> «</span>
-              {/if}
-            </div>
-          {/each}
-        </div>
+        <div class="flex flex-col"></div>
       </div>
     </AdditionStat>
     <AdditionStat text="Total Candies Used" data={`${pets.totalCandyUsed}`} />
diff --git a/src/lib/sections/stats/Rift.svelte b/src/lib/sections/stats/Rift.svelte
index 442b4ff8..36d38ea3 100644
--- a/src/lib/sections/stats/Rift.svelte
+++ b/src/lib/sections/stats/Rift.svelte
@@ -2,8 +2,8 @@
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Chip from "$lib/components/Chip.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import { cn } from "$lib/utils";
-  import type { Stats as StatsType } from "$types/stats";
+  import { cn } from "$lib/shared/utils";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { formatDate, formatDistanceToNowStrict } from "date-fns";
   import { getContext } from "svelte";
 
diff --git a/src/lib/sections/stats/Slayer.svelte b/src/lib/sections/stats/Slayer.svelte
index 60fadaa5..3d1a7662 100644
--- a/src/lib/sections/stats/Slayer.svelte
+++ b/src/lib/sections/stats/Slayer.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Bonus from "$lib/components/Bonus.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { Avatar, Progress } from "bits-ui";
   import Image from "lucide-svelte/icons/image";
   import { format } from "numerable";
diff --git a/src/lib/sections/stats/Weapons.svelte b/src/lib/sections/stats/Weapons.svelte
index a5451b09..e1c85756 100644
--- a/src/lib/sections/stats/Weapons.svelte
+++ b/src/lib/sections/stats/Weapons.svelte
@@ -2,7 +2,7 @@
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Item from "$lib/components/Item.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { getContext } from "svelte";
 
   const profile = getContext<StatsType>("profile");
diff --git a/src/lib/sections/stats/misc/auctions.svelte b/src/lib/sections/stats/misc/auctions.svelte
index e4a35378..aa2d040a 100644
--- a/src/lib/sections/stats/misc/auctions.svelte
+++ b/src/lib/sections/stats/misc/auctions.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
 
diff --git a/src/lib/sections/stats/misc/claimed.svelte b/src/lib/sections/stats/misc/claimed.svelte
index 2076f50d..564914fd 100644
--- a/src/lib/sections/stats/misc/claimed.svelte
+++ b/src/lib/sections/stats/misc/claimed.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { formatDate, formatDistanceToNowStrict } from "date-fns";
   import { getContext } from "svelte";
 
diff --git a/src/lib/sections/stats/misc/damage.svelte b/src/lib/sections/stats/misc/damage.svelte
index a5f9b292..673f1cea 100644
--- a/src/lib/sections/stats/misc/damage.svelte
+++ b/src/lib/sections/stats/misc/damage.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
 
diff --git a/src/lib/sections/stats/misc/dragons.svelte b/src/lib/sections/stats/misc/dragons.svelte
index fc38594c..45a08fa3 100644
--- a/src/lib/sections/stats/misc/dragons.svelte
+++ b/src/lib/sections/stats/misc/dragons.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
 
diff --git a/src/lib/sections/stats/misc/endstone.svelte b/src/lib/sections/stats/misc/endstone.svelte
index 8f5e43f6..32eadd63 100644
--- a/src/lib/sections/stats/misc/endstone.svelte
+++ b/src/lib/sections/stats/misc/endstone.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
 
diff --git a/src/lib/sections/stats/misc/essence.svelte b/src/lib/sections/stats/misc/essence.svelte
index e4c6e747..69742426 100644
--- a/src/lib/sections/stats/misc/essence.svelte
+++ b/src/lib/sections/stats/misc/essence.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import Chip from "$lib/components/Chip.svelte";
-  import { cn } from "$lib/utils";
-  import type { Stats as StatsType } from "$types/stats";
+  import { cn } from "$lib/shared/utils";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
 
diff --git a/src/lib/sections/stats/misc/gifts.svelte b/src/lib/sections/stats/misc/gifts.svelte
index 1ba71e27..f0f486de 100644
--- a/src/lib/sections/stats/misc/gifts.svelte
+++ b/src/lib/sections/stats/misc/gifts.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
 
diff --git a/src/lib/sections/stats/misc/jerry.svelte b/src/lib/sections/stats/misc/jerry.svelte
index e0178024..06c2d32e 100644
--- a/src/lib/sections/stats/misc/jerry.svelte
+++ b/src/lib/sections/stats/misc/jerry.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
 
diff --git a/src/lib/sections/stats/misc/kills.svelte b/src/lib/sections/stats/misc/kills.svelte
index 6554f6c2..a7a7c1f7 100644
--- a/src/lib/sections/stats/misc/kills.svelte
+++ b/src/lib/sections/stats/misc/kills.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
   import VirtualList from "svelte-tiny-virtual-list";
diff --git a/src/lib/sections/stats/misc/mythological.svelte b/src/lib/sections/stats/misc/mythological.svelte
index 4ba31305..a8af4998 100644
--- a/src/lib/sections/stats/misc/mythological.svelte
+++ b/src/lib/sections/stats/misc/mythological.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
 
diff --git a/src/lib/sections/stats/misc/pet.svelte b/src/lib/sections/stats/misc/pet.svelte
index 9bb94be7..9749b280 100644
--- a/src/lib/sections/stats/misc/pet.svelte
+++ b/src/lib/sections/stats/misc/pet.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
 
diff --git a/src/lib/sections/stats/misc/potions.svelte b/src/lib/sections/stats/misc/potions.svelte
index 3ba2c022..fb042134 100644
--- a/src/lib/sections/stats/misc/potions.svelte
+++ b/src/lib/sections/stats/misc/potions.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
 
diff --git a/src/lib/sections/stats/misc/races.svelte b/src/lib/sections/stats/misc/races.svelte
index befab889..e2b0b128 100644
--- a/src/lib/sections/stats/misc/races.svelte
+++ b/src/lib/sections/stats/misc/races.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
 
@@ -39,7 +39,7 @@
           {#if race.name === "Other"}
             <div class="flex h-full w-full flex-col flex-wrap gap-1">
               {#each Object.entries(race.races) as [_, value]}
-                {#if "name" in value}
+                {#if value && "name" in value}
                   <AdditionStat class="text-base" text={value.name} data={format(value.time)} />
                 {/if}
               {/each}
diff --git a/src/lib/sections/stats/misc/uncategorized.svelte b/src/lib/sections/stats/misc/uncategorized.svelte
index 22ccd83e..c28ed1ca 100644
--- a/src/lib/sections/stats/misc/uncategorized.svelte
+++ b/src/lib/sections/stats/misc/uncategorized.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
 
@@ -11,7 +11,7 @@
 <Items title="Uncategorized">
   <div slot="text">
     {#if misc.uncategorized.soulflow}
-      <AdditionStat text="Soulflow" data={format(misc.uncategorized.soulflow, "0.00a")} />
+      <AdditionStat text="Soulflow" data={format(misc.uncategorized.soulflow as number, "0.00a")} />
     {/if}
 
     {#if misc.uncategorized.teleporter_pill_consumed}
@@ -19,11 +19,11 @@
     {/if}
 
     {#if misc.uncategorized.reaper_peppers_eaten}
-      <AdditionStat text="Soulflow" data={misc.uncategorized.reaper_peppers_eaten} maxed={misc.uncategorized.reaper_peppers_eaten === 5} />
+      <AdditionStat text="Soulflow" data={misc.uncategorized.reaper_peppers_eaten as number} maxed={misc.uncategorized.reaper_peppers_eaten === 5} />
     {/if}
 
     {#if misc.uncategorized.personal_bank !== "Unknown"}
-      <AdditionStat text="Bank Cooldown" data={misc.uncategorized.personal_bank} maxed={misc.uncategorized.personal_bank === "None"} />
+      <AdditionStat text="Bank Cooldown" data={misc.uncategorized.personal_bank as number} maxed={misc.uncategorized.personal_bank === "None"} />
     {/if}
   </div>
 </Items>
diff --git a/src/lib/sections/stats/misc/upgrades.svelte b/src/lib/sections/stats/misc/upgrades.svelte
index af1373fb..4ad877b1 100644
--- a/src/lib/sections/stats/misc/upgrades.svelte
+++ b/src/lib/sections/stats/misc/upgrades.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { format } from "numerable";
   import { getContext } from "svelte";
 
diff --git a/src/lib/sections/stats/skills/enchanting.svelte b/src/lib/sections/stats/skills/enchanting.svelte
index 4f5e0d4a..3141df8d 100644
--- a/src/lib/sections/stats/skills/enchanting.svelte
+++ b/src/lib/sections/stats/skills/enchanting.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Chip from "$lib/components/Chip.svelte";
-  import type { Stats as StatsType } from "$types/stats";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { Collapsible } from "bits-ui";
   import { formatDistanceStrict } from "date-fns";
   import ChevronDown from "lucide-svelte/icons/chevron-down";
diff --git a/src/lib/sections/stats/skills/farming.svelte b/src/lib/sections/stats/skills/farming.svelte
index f04ee617..8bb581e5 100644
--- a/src/lib/sections/stats/skills/farming.svelte
+++ b/src/lib/sections/stats/skills/farming.svelte
@@ -3,9 +3,9 @@
   import Chip from "$lib/components/Chip.svelte";
   import Item from "$lib/components/Item.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import { formatNumber, getRarityClass } from "$lib/tools";
-  import { cn } from "$lib/utils";
-  import type { Stats as StatsType } from "$types/stats";
+  import { formatNumber, getRarityClass } from "$lib/shared/helper";
+  import { cn } from "$lib/shared/utils";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { Collapsible } from "bits-ui";
   import ChevronDown from "lucide-svelte/icons/chevron-down";
   import { getContext } from "svelte";
diff --git a/src/lib/sections/stats/skills/fishing.svelte b/src/lib/sections/stats/skills/fishing.svelte
index 6a41eac8..d65472f9 100644
--- a/src/lib/sections/stats/skills/fishing.svelte
+++ b/src/lib/sections/stats/skills/fishing.svelte
@@ -3,9 +3,9 @@
   import Chip from "$lib/components/Chip.svelte";
   import Item from "$lib/components/Item.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import { getRarityClass, renderLore } from "$lib/tools";
-  import { cn } from "$lib/utils";
-  import type { Stats as StatsType } from "$types/stats";
+  import { getRarityClass, renderLore } from "$lib/shared/helper";
+  import { cn } from "$lib/shared/utils";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { Avatar, Collapsible } from "bits-ui";
   import ChevronDown from "lucide-svelte/icons/chevron-down";
   import Image from "lucide-svelte/icons/image";
diff --git a/src/lib/sections/stats/skills/mining.svelte b/src/lib/sections/stats/skills/mining.svelte
index cbe2478d..689b71e8 100644
--- a/src/lib/sections/stats/skills/mining.svelte
+++ b/src/lib/sections/stats/skills/mining.svelte
@@ -2,9 +2,9 @@
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Item from "$lib/components/Item.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
-  import { getRarityClass } from "$lib/tools";
-  import { cn } from "$lib/utils";
-  import type { Stats as StatsType } from "$types/stats";
+  import { getRarityClass } from "$lib/shared/helper";
+  import { cn } from "$lib/shared/utils";
+  import type { Stats as StatsType } from "$lib/types/stats";
   import { formatDate, formatDistanceStrict } from "date-fns";
   import { format } from "numerable";
   import { getContext } from "svelte";
diff --git a/src/lib/server/constants/NotEnoughUpdates-REPO b/src/lib/server/constants/NotEnoughUpdates-REPO
new file mode 160000
index 00000000..0130a756
--- /dev/null
+++ b/src/lib/server/constants/NotEnoughUpdates-REPO
@@ -0,0 +1 @@
+Subproject commit 0130a756513b7163e6b646a79278998f51ba7d81
diff --git a/src/lib/constants/accessories.ts b/src/lib/server/constants/accessories.ts
similarity index 99%
rename from src/lib/constants/accessories.ts
rename to src/lib/server/constants/accessories.ts
index 6deb4b8d..bb092a75 100644
--- a/src/lib/constants/accessories.ts
+++ b/src/lib/server/constants/accessories.ts
@@ -1,6 +1,6 @@
 // CREDITS: https://github.com/MattTheCuber (Modified)
 import type { SpecialAccessory, SpecialAccessoryConstant, allAccessories } from "$types/stats";
-import { ITEMS as ALL_ITEMS } from "./items";
+import { ITEMS as ALL_ITEMS } from "$lib/shared/constants/items";
 
 let ITEMS = [] as allAccessories[];
 function getAccessories() {
diff --git a/src/lib/constants/armor.ts b/src/lib/server/constants/armor.ts
similarity index 100%
rename from src/lib/constants/armor.ts
rename to src/lib/server/constants/armor.ts
diff --git a/src/lib/constants/collections.ts b/src/lib/server/constants/collections.ts
similarity index 100%
rename from src/lib/constants/collections.ts
rename to src/lib/server/constants/collections.ts
diff --git a/src/lib/server/constants/constants.ts b/src/lib/server/constants/constants.ts
new file mode 100644
index 00000000..9b997b03
--- /dev/null
+++ b/src/lib/server/constants/constants.ts
@@ -0,0 +1,21 @@
+export * from "$lib/server/constants/accessories";
+export * from "$lib/server/constants/armor";
+export * from "$lib/server/constants/collections";
+export * from "$lib/server/constants/crimson_isle";
+export * from "$lib/server/constants/dungeons";
+export * from "$lib/server/constants/enchanting";
+export * from "$lib/server/constants/farming";
+export * from "$lib/server/constants/fishing";
+export * from "$lib/server/constants/gemstones";
+export * from "$lib/shared/constants/items";
+export * from "$lib/server/constants/mining";
+export * from "$lib/server/constants/minions";
+export * from "$lib/server/constants/misc";
+export * from "$lib/server/constants/mobs";
+export * from "$lib/server/constants/pets";
+export * from "$lib/server/constants/ranks";
+export * from "$lib/server/constants/rift";
+export * from "$lib/server/constants/skills";
+export * from "$lib/server/constants/skins";
+export * from "$lib/server/constants/slayer";
+export * from "$lib/server/constants/trophy_fish";
diff --git a/src/lib/constants/crimson_isle.ts b/src/lib/server/constants/crimson_isle.ts
similarity index 100%
rename from src/lib/constants/crimson_isle.ts
rename to src/lib/server/constants/crimson_isle.ts
diff --git a/src/lib/constants/dungeons.ts b/src/lib/server/constants/dungeons.ts
similarity index 100%
rename from src/lib/constants/dungeons.ts
rename to src/lib/server/constants/dungeons.ts
diff --git a/src/lib/constants/enchanting.ts b/src/lib/server/constants/enchanting.ts
similarity index 100%
rename from src/lib/constants/enchanting.ts
rename to src/lib/server/constants/enchanting.ts
diff --git a/src/lib/constants/error.ts b/src/lib/server/constants/error.ts
similarity index 100%
rename from src/lib/constants/error.ts
rename to src/lib/server/constants/error.ts
diff --git a/src/lib/constants/farming.ts b/src/lib/server/constants/farming.ts
similarity index 100%
rename from src/lib/constants/farming.ts
rename to src/lib/server/constants/farming.ts
diff --git a/src/lib/constants/fishing.ts b/src/lib/server/constants/fishing.ts
similarity index 100%
rename from src/lib/constants/fishing.ts
rename to src/lib/server/constants/fishing.ts
diff --git a/src/lib/constants/gemstones.ts b/src/lib/server/constants/gemstones.ts
similarity index 100%
rename from src/lib/constants/gemstones.ts
rename to src/lib/server/constants/gemstones.ts
diff --git a/src/lib/constants/mining.ts b/src/lib/server/constants/mining.ts
similarity index 92%
rename from src/lib/constants/mining.ts
rename to src/lib/server/constants/mining.ts
index 6153f978..516fc8bd 100644
--- a/src/lib/constants/mining.ts
+++ b/src/lib/server/constants/mining.ts
@@ -1,5 +1,5 @@
-import * as constants from "$constants/constants";
-import * as helper from "$lib/helper";
+import * as helper from "$lib/server/helper";
+import { SYMBOLS } from "$lib/shared/constants/stats";
 import type { Crystal, HotmItemData, NodeData, Skill } from "$types/global";
 
 const UPGRADE_TYPES = {
@@ -563,7 +563,7 @@ class MiningSpeed2 extends Node {
 
   perk(level: number) {
     const val = level * 40;
-    return [`§7Grants §a+${val} §6${constants.SYMBOLS.mining_speed} Mining Speed§7.`];
+    return [`§7Grants §a+${val} §6${SYMBOLS.mining_speed} Mining Speed§7.`];
   }
 }
 
@@ -609,7 +609,7 @@ class MiningFortune2 extends Node {
 
   perk(level: number) {
     const val = level * 5;
-    return [`§7Grants §a+${val} §6${constants.SYMBOLS.mining_fortune} Mining Fortune§7.`];
+    return [`§7Grants §a+${val} §6${SYMBOLS.mining_fortune} Mining Fortune§7.`];
   }
 }
 
@@ -658,7 +658,7 @@ class LonesomeMiner extends Node {
 
   perk(level: number) {
     const val = helper.round(5 + (level - 1) * 0.5);
-    return [`§7Increases §c${constants.SYMBOLS.strength} Strength, §9${constants.SYMBOLS.crit_chance} Crit Chance, §9${constants.SYMBOLS.crit_damage} Crit Damage, §a${constants.SYMBOLS.defense} Defense, and §c${constants.SYMBOLS.health} Health §7statistics gain by §a${val}% §7while in the Crystal Hollows.`];
+    return [`§7Increases §c${SYMBOLS.strength} Strength, §9${SYMBOLS.crit_chance} Crit Chance, §9${SYMBOLS.crit_damage} Crit Damage, §a${SYMBOLS.defense} Defense, and §c${SYMBOLS.health} Health §7statistics gain by §a${val}% §7while in the Crystal Hollows.`];
   }
 }
 
@@ -681,7 +681,7 @@ class Professional extends Node {
 
   perk(level: number) {
     const val = 50 + level * 5;
-    return [`§7Gain §a+${val}§7 §6${constants.SYMBOLS.mining_speed} Mining Speed§7 when mining Gemstones.`];
+    return [`§7Gain §a+${val}§7 §6${SYMBOLS.mining_speed} Mining Speed§7 when mining Gemstones.`];
   }
 }
 
@@ -734,7 +734,7 @@ class Fortunate extends Node {
 
   perk(level: number) {
     const val = 20 + level * 4;
-    return [`§7Grants §a+${val}§7 §6${constants.SYMBOLS.mining_fortune} Mining Fortune§7 when mining Gemstone.`];
+    return [`§7Grants §a+${val}§7 §6${SYMBOLS.mining_fortune} Mining Fortune§7 when mining Gemstone.`];
   }
 }
 
@@ -784,7 +784,7 @@ class ManiacMiner extends Node {
     const speed = [1, 1, 1][this.pickaxeAbilityLevel - 1];
     const duration = [10, 15, 20][this.pickaxeAbilityLevel - 1];
     const cooldown = [60, 59, 59][this.pickaxeAbilityLevel - 1];
-    return ["§6Pickaxe Ability: Maniac Miner", `§7Spends all your Mana and grants §a+${speed} §6${constants.SYMBOLS.mining_speed} Mining Speed §7for every 10 Mana spent, for §a${duration}s§7.`, `§8Cooldown: §a${cooldown}s`, "", "§8Pickaxe Abilities apply to all of your pickaxes. You can select a Pickaxe Ability from your Heart of the Mountain.", "", "§8Upgrade your Pickaxe Abilities by unlocking §cPeak of the Mountain §8in this menu!"];
+    return ["§6Pickaxe Ability: Maniac Miner", `§7Spends all your Mana and grants §a+${speed} §6${SYMBOLS.mining_speed} Mining Speed §7for every 10 Mana spent, for §a${duration}s§7.`, `§8Cooldown: §a${cooldown}s`, "", "§8Pickaxe Abilities apply to all of your pickaxes. You can select a Pickaxe Ability from your Heart of the Mountain.", "", "§8Upgrade your Pickaxe Abilities by unlocking §cPeak of the Mountain §8in this menu!"];
   }
 }
 
@@ -891,7 +891,7 @@ class SkyMall extends Node {
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   perk(level: number) {
-    return ["§7Every SkyBlock day, you receive a random buff in the §2Dwarven Mines§7.", "", "§7Possible Buffs", `§8 ■ §7Gain §a+100 §6${constants.SYMBOLS.mining_speed} Mining Speed§7.`, `§8 ■ §7Gain §a+50 §6${constants.SYMBOLS.mining_fortune} Mining Fortune§7.`, "§8 ■ §7Gain §a+15% §7chance to gain extra Powder while mining.", "§8 ■ §7Reduce Pickaxe Ability cooldown by §a20%§7.", "§8 ■ §7§a10x §7chance to find Goblins while mining.", "§8 ■ §7Gain §a5x §9Titanium §7drops."];
+    return ["§7Every SkyBlock day, you receive a random buff in the §2Dwarven Mines§7.", "", "§7Possible Buffs", `§8 ■ §7Gain §a+100 §6${SYMBOLS.mining_speed} Mining Speed§7.`, `§8 ■ §7Gain §a+50 §6${SYMBOLS.mining_fortune} Mining Fortune§7.`, "§8 ■ §7Gain §a+15% §7chance to gain extra Powder while mining.", "§8 ■ §7Reduce Pickaxe Ability cooldown by §a20%§7.", "§8 ■ §7§a10x §7chance to find Goblins while mining.", "§8 ■ §7Gain §a5x §9Titanium §7drops."];
   }
 }
 
@@ -913,7 +913,7 @@ class MiningMadness extends Node {
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   perk(level: number) {
-    return [`§7Grants §a+50 §6${constants.SYMBOLS.mining_speed} Mining Speed §7and §6${constants.SYMBOLS.mining_fortune} Mining Fortune§7.`];
+    return [`§7Grants §a+50 §6${SYMBOLS.mining_speed} Mining Speed §7and §6${SYMBOLS.mining_fortune} Mining Fortune§7.`];
   }
 }
 
@@ -1005,7 +1005,7 @@ class FrontLoaded extends Node {
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   perk(level: number) {
-    return [`§7Grants §a+100 §6${constants.SYMBOLS.mining_speed} Mining Speed §7and §6${constants.SYMBOLS.mining_fortune} Mining Fortune §7as well as §a+2 base powder §7for the first §e2,500 §7ores you mine in a day.`];
+    return [`§7Grants §a+100 §6${SYMBOLS.mining_speed} Mining Speed §7and §6${SYMBOLS.mining_fortune} Mining Fortune §7as well as §a+2 base powder §7for the first §e2,500 §7ores you mine in a day.`];
   }
 }
 
@@ -1027,7 +1027,7 @@ class PrecisionMining extends Node {
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   perk(level: number) {
-    return [`§7When mining ore, a particle target appears on the block that increases your §6${constants.SYMBOLS.mining_speed} Mining Speed §7by §a30% §7when aiming at it.`];
+    return [`§7When mining ore, a particle target appears on the block that increases your §6${SYMBOLS.mining_speed} Mining Speed §7by §a30% §7when aiming at it.`];
   }
 }
 
@@ -1097,7 +1097,7 @@ class Crystallized extends Node {
   perk(level: number) {
     const speed = 20 + (level - 1) * 6;
     const fortune = 20 + (level - 1) * 5;
-    return [`§7Increases §6${speed} ${constants.SYMBOLS.mining_speed} Mining Speed §7and §6${fortune} ${constants.SYMBOLS.mining_fortune} Mining Fortune §7near §5Fallen Stars§7.`];
+    return [`§7Increases §6${speed} ${SYMBOLS.mining_speed} Mining Speed §7and §6${fortune} ${SYMBOLS.mining_fortune} Mining Fortune §7near §5Fallen Stars§7.`];
   }
 }
 
@@ -1123,7 +1123,7 @@ class MiningSpeedBoost extends Node {
     const effect = [200, 300, 400][this.pickaxeAbilityLevel - 1];
     const duration = [15, 20, 25][this.pickaxeAbilityLevel - 1];
     const cooldown = [120, 120, 120][this.pickaxeAbilityLevel - 1];
-    return ["§6Pickaxe Ability: Mining Speed Boost", `§7Grants §a+${effect}% §6${constants.SYMBOLS.mining_speed} Mining Speed §7for §a${duration}s§7.`, `§8Cooldown: §a${cooldown}s`, "", "§8Pickaxe Abilities apply to all of your pickaxes. You can select a Pickaxe Ability from your Heart of the Mountain.", "", "§8Upgrade your Pickaxe Abilities by unlocking §cPeak of the Mountain §8in this menu!"];
+    return ["§6Pickaxe Ability: Mining Speed Boost", `§7Grants §a+${effect}% §6${SYMBOLS.mining_speed} Mining Speed §7for §a${duration}s§7.`, `§8Cooldown: §a${cooldown}s`, "", "§8Pickaxe Abilities apply to all of your pickaxes. You can select a Pickaxe Ability from your Heart of the Mountain.", "", "§8Upgrade your Pickaxe Abilities by unlocking §cPeak of the Mountain §8in this menu!"];
   }
 }
 
@@ -1169,7 +1169,7 @@ class MiningFortune extends Node {
 
   perk(level: number) {
     const val = level * 5;
-    return [`§7Grants §a+${val} §6${constants.SYMBOLS.mining_fortune} Mining Fortune§7.`];
+    return [`§7Grants §a+${val} §6${SYMBOLS.mining_fortune} Mining Fortune§7.`];
   }
 }
 
@@ -1243,7 +1243,7 @@ class MiningSpeed extends Node {
 
   perk(level: number) {
     const val = level * 20;
-    return [`§7Grants §a+${val} §6${constants.SYMBOLS.mining_speed} Mining Speed§7.`];
+    return [`§7Grants §a+${val} §6${SYMBOLS.mining_speed} Mining Speed§7.`];
   }
 }
 class GemstoneInfusion extends Node {
@@ -1379,7 +1379,7 @@ class RagsOfRiches extends Node {
   perk(level: number) {
     const val = level * 2;
 
-    return [`§7Grants §a+${val} §6${constants.SYMBOLS.mining_fortune} Mining Fortune §7while mining inside a §bGlaite Mineshaft`];
+    return [`§7Grants §a+${val} §6${SYMBOLS.mining_fortune} Mining Fortune §7while mining inside a §bGlaite Mineshaft`];
   }
 }
 
@@ -1405,7 +1405,7 @@ class HazardousMiner extends Node {
     const duration = [16.5, 16.5, 16.5][this.pickaxeAbilityLevel - 1];
     const radius = [20, 20, 20][this.pickaxeAbilityLevel - 1];
     const cooldown = [140, 140, 140][this.pickaxeAbilityLevel - 1];
-    return ["§6Pickaxe Ability: Hazardous Miner", `§7Grants §a+${boost} §6${constants.SYMBOLS.mining_speed} Mining Speed §7for §a${duration}s §7for each enemy within §a${radius} §7blocks`, `§8Cooldown: §a${cooldown}s`, "", "§8Pickaxe Abilities apply to all of your pickaxes. You can select a Pickaxe Ability from your Heart of the Mountain.", "", "§8Upgrade your Pickaxe Abilities by unlocking §cPeak of the Mountain §8in this menu!"];
+    return ["§6Pickaxe Ability: Hazardous Miner", `§7Grants §a+${boost} §6${SYMBOLS.mining_speed} Mining Speed §7for §a${duration}s §7for each enemy within §a${radius} §7blocks`, `§8Cooldown: §a${cooldown}s`, "", "§8Pickaxe Abilities apply to all of your pickaxes. You can select a Pickaxe Ability from your Heart of the Mountain.", "", "§8Upgrade your Pickaxe Abilities by unlocking §cPeak of the Mountain §8in this menu!"];
   }
 }
 
@@ -1443,7 +1443,7 @@ class SubzeroMining extends Node {
   perk(level: number) {
     const val = level * 1;
 
-    return [`§7Grants §a+${val} §6${constants.SYMBOLS.mining_fortune} Mining Fortune §7when mining §bGlacite§7.`];
+    return [`§7Grants §a+${val} §6${SYMBOLS.mining_fortune} Mining Fortune §7when mining §bGlacite§7.`];
   }
 }
 
@@ -1462,7 +1462,7 @@ class EagerAdventurer extends Node {
   perk(level: number) {
     const val = level * 2;
 
-    return [`§7Grants §a+${val} §6${constants.SYMBOLS.mining_speed} Mining Speed §7when inside the §bGlacite Mineshafts§7.`];
+    return [`§7Grants §a+${val} §6${SYMBOLS.mining_speed} Mining Speed §7when inside the §bGlacite Mineshafts§7.`];
   }
 }
 
@@ -1498,7 +1498,7 @@ class WarmHearted extends Node {
   perk(level: number) {
     const val = level * 0.2;
 
-    return [`§7Grants §a+${val} §b${constants.SYMBOLS.cold_resistence} Cold Resistence§7.`];
+    return [`§7Grants §a+${val} §b${SYMBOLS.cold_resistence} Cold Resistence§7.`];
   }
 }
 
@@ -1555,7 +1555,7 @@ class StrongArm extends Node {
   perk(level: number) {
     const val = level * 5;
 
-    return [`§7Gain §a+${val} §6${constants.SYMBOLS.mining_speed} Mining Speed §7when mining Tungsten or Umber.`];
+    return [`§7Gain §a+${val} §6${SYMBOLS.mining_speed} Mining Speed §7when mining Tungsten or Umber.`];
   }
 }
 
@@ -1591,7 +1591,7 @@ class MineshaftMayhem extends Node {
   }
 
   perk() {
-    return [`§7Every time your enter a §bGlacite Mineshaft§7, you receive a random buff.`, ``, `§7Possible Buffs`, `§8 ■ §a+5% §7chance to find a §9Suspicious Scrap§7.`, `§8 ■ §7Gain §a100 §6${constants.SYMBOLS.mining_speed} Mining Speed§7.`, `§8 ■ §7Gain §a200 §6${constants.SYMBOLS.mining_fortune} Mining Fortune§7.`, `§8 ■ §7Gain §a+10 §b${constants.SYMBOLS.cold_resistence} Cold Resistence§7.`, `§8 ■ §7Reduce Pickaxe Ability cooldown by §a25%§7.`];
+    return [`§7Every time your enter a §bGlacite Mineshaft§7, you receive a random buff.`, ``, `§7Possible Buffs`, `§8 ■ §a+5% §7chance to find a §9Suspicious Scrap§7.`, `§8 ■ §7Gain §a100 §6${SYMBOLS.mining_speed} Mining Speed§7.`, `§8 ■ §7Gain §a200 §6${SYMBOLS.mining_fortune} Mining Fortune§7.`, `§8 ■ §7Gain §a+10 §b${SYMBOLS.cold_resistence} Cold Resistence§7.`, `§8 ■ §7Reduce Pickaxe Ability cooldown by §a25%§7.`];
   }
 }
 
@@ -1643,7 +1643,7 @@ class HotmStats extends HotmItem {
   }
 
   get lore() {
-    return [`§7Token of the Mountain: §5${this.resources.token_of_the_mountain.toLocaleString()}`, "", "§7§8Use §5Token of the Mountain §8to unlock perks and abilities above!", "", `§9${constants.SYMBOLS.powder} Powder`, "§9Powders §8are dropped from mining ores in the §2Dwarven Mines §8and are used to upgrade the perks you've unlocked!", "", `§7Mithril Powder: §2${this.resources.mithril_powder.toLocaleString()}`, `§7Gemstone Powder: §d${this.resources.gemstone_powder.toLocaleString()}`, "", "§8Increase your chance to gain extra Powder by unlocking perks, equipping the §2Mithril Golem Pet§8, and more!"];
+    return [`§7Token of the Mountain: §5${this.resources.token_of_the_mountain.toLocaleString()}`, "", "§7§8Use §5Token of the Mountain §8to unlock perks and abilities above!", "", `§9${SYMBOLS.powder} Powder`, "§9Powders §8are dropped from mining ores in the §2Dwarven Mines §8and are used to upgrade the perks you've unlocked!", "", `§7Mithril Powder: §2${this.resources.mithril_powder.toLocaleString()}`, `§7Gemstone Powder: §d${this.resources.gemstone_powder.toLocaleString()}`, "", "§8Increase your chance to gain extra Powder by unlocking perks, equipping the §2Mithril Golem Pet§8, and more!"];
   }
 }
 
diff --git a/src/lib/constants/minions.ts b/src/lib/server/constants/minions.ts
similarity index 100%
rename from src/lib/constants/minions.ts
rename to src/lib/server/constants/minions.ts
diff --git a/src/lib/constants/misc.ts b/src/lib/server/constants/misc.ts
similarity index 100%
rename from src/lib/constants/misc.ts
rename to src/lib/server/constants/misc.ts
diff --git a/src/lib/constants/mobs.ts b/src/lib/server/constants/mobs.ts
similarity index 100%
rename from src/lib/constants/mobs.ts
rename to src/lib/server/constants/mobs.ts
diff --git a/src/lib/constants/pets.ts b/src/lib/server/constants/pets.ts
similarity index 100%
rename from src/lib/constants/pets.ts
rename to src/lib/server/constants/pets.ts
diff --git a/src/lib/constants/ranks.ts b/src/lib/server/constants/ranks.ts
similarity index 100%
rename from src/lib/constants/ranks.ts
rename to src/lib/server/constants/ranks.ts
diff --git a/src/lib/constants/rift.ts b/src/lib/server/constants/rift.ts
similarity index 100%
rename from src/lib/constants/rift.ts
rename to src/lib/server/constants/rift.ts
diff --git a/src/lib/constants/skills.ts b/src/lib/server/constants/skills.ts
similarity index 100%
rename from src/lib/constants/skills.ts
rename to src/lib/server/constants/skills.ts
diff --git a/src/lib/constants/skins.ts b/src/lib/server/constants/skins.ts
similarity index 100%
rename from src/lib/constants/skins.ts
rename to src/lib/server/constants/skins.ts
diff --git a/src/lib/constants/slayer.ts b/src/lib/server/constants/slayer.ts
similarity index 100%
rename from src/lib/constants/slayer.ts
rename to src/lib/server/constants/slayer.ts
diff --git a/src/lib/constants/trophy_fish.ts b/src/lib/server/constants/trophy_fish.ts
similarity index 99%
rename from src/lib/constants/trophy_fish.ts
rename to src/lib/server/constants/trophy_fish.ts
index 778d52a4..032acbf0 100644
--- a/src/lib/constants/trophy_fish.ts
+++ b/src/lib/server/constants/trophy_fish.ts
@@ -1,4 +1,4 @@
-import { SYMBOLS } from "$constants/constants";
+import { SYMBOLS } from "$lib/shared/constants/stats";
 
 export const TROPHY_FISH = {
   BLOBFISH: {
diff --git a/src/lib/server/constants/update-collections.ts b/src/lib/server/constants/update-collections.ts
index 1929c719..5eff2acf 100644
--- a/src/lib/server/constants/update-collections.ts
+++ b/src/lib/server/constants/update-collections.ts
@@ -1,4 +1,4 @@
-import type { Collection } from "$constants/collections";
+import type { Collection } from "$lib/server/constants/collections";
 import MONGO from "$lib/server/db/mongo";
 
 export const COLLECTIONS = new Map<string, Collection>();
diff --git a/src/lib/server/constants/update-items.ts b/src/lib/server/constants/update-items.ts
index de52d088..aa3e5ac0 100644
--- a/src/lib/server/constants/update-items.ts
+++ b/src/lib/server/constants/update-items.ts
@@ -1,6 +1,6 @@
-import type { DatabaseItem } from "$types/global";
-import { ITEMS } from "$lib/constants/items";
+import { ITEMS } from "$lib/shared/constants/items";
 import MONGO from "$lib/server/db/mongo";
+import type { DatabaseItem } from "$types/global";
 
 export async function updateItems() {
   const items = await MONGO.collection("items").findOne({});
diff --git a/src/lib/server/db/mongo/update-collections.ts b/src/lib/server/db/mongo/update-collections.ts
index e6f2e7ed..37fed356 100644
--- a/src/lib/server/db/mongo/update-collections.ts
+++ b/src/lib/server/db/mongo/update-collections.ts
@@ -1,4 +1,4 @@
-import type { Collection } from "$constants/collections";
+import type { Collection } from "$lib/server/constants/collections";
 import MONGO from "../mongo";
 
 const headers = { Accept: "application/json", "User-Agent": "SkyCrypt" };
diff --git a/src/lib/helper.ts b/src/lib/server/helper.ts
similarity index 86%
rename from src/lib/helper.ts
rename to src/lib/server/helper.ts
index d3ffcbc0..2bddd6c8 100644
--- a/src/lib/helper.ts
+++ b/src/lib/server/helper.ts
@@ -1,11 +1,12 @@
 import type { Item, ProcessedItem } from "$types/stats";
 import { getPrices } from "skyhelper-networth";
 import { v4 } from "uuid";
+import { getTexture } from "../custom_resources";
 import * as constants from "./constants/constants";
-import { getTexture } from "./custom_resources";
 
-export * from "$lib/helper/cache";
-export * from "$lib/helper/item";
+export * from "$lib/server/helper/cache";
+export * from "$lib/server/helper/item";
+export * from "$lib/shared/helper";
 
 /**
  * Converts an RGB color value to its corresponding hexadecimal representation.
@@ -127,16 +128,6 @@ export function rarityNameToInt(string: string) {
   return constants.RARITIES.indexOf(string.toLowerCase());
 }
 
-export function formatNumber(n: number, digits = 2) {
-  return Intl.NumberFormat("en-US", {
-    notation: "compact",
-    minimumFractionDigits: digits,
-    maximumFractionDigits: digits
-  })
-    .format(n)
-    .replace(/\.0+([A-Za-z])?$/, "$1");
-}
-
 /**
  * Returns the price of the item. Returns 0 if the item is not found or if the item argument is falsy.
  * @param {string} item - The ID of the item to retrieve the price for.
@@ -358,10 +349,50 @@ export function getHeadTextureUUID(value: string) {
   return uuid;
 }
 
-export function uniqBy<T>(arr: T[], key: string) {
-  const seen = new Set();
-  return arr.filter((item) => {
-    const k = (item as Record<string, unknown>)[key];
-    return seen.has(k) ? false : seen.add(k);
-  });
+import { removeFormatting } from "$lib/shared/helper";
+import type { ItemStats } from "$types/processed/profile/stats";
+import { STATS_DATA } from "$lib/shared/constants/stats";
+
+/**
+ * Gets the stats from an item
+ * @param  {Item} piece
+ * @returns {ItemStats}
+ */
+export function getStatsFromItem(piece: Item): ItemStats {
+  const regex = /^([A-Za-z ]+): ([+-]([0-9]+(?:,[0-9]{3})*(?:\.[0-9]{0,2})?))/;
+  const stats = {} as ItemStats;
+
+  if (!piece) {
+    return stats;
+  }
+
+  const lore = (piece.tag.display?.Lore || []).map((line) => removeFormatting(line));
+
+  for (const line of lore) {
+    const match = regex.exec(line);
+
+    if (match == null) {
+      continue;
+    }
+
+    const statName = Object.keys(STATS_DATA).find((key) => STATS_DATA[key].nameLore === match[1]);
+    const statValue = parseFloat(match[2].replace(/,/g, ""));
+
+    if (statName) {
+      stats[statName] = (stats[statName] || 0) + statValue;
+    }
+  }
+
+  return stats;
+}
+
+/**
+ * Capitalizes the first letter of a string
+ * @param {string} string
+ * @returns {string}
+ * @deprecated Use CSS text-transform: capitalize; (capitalize in Tailwind CSS) instead.
+ * @DO_NOT_USE
+ */
+export function capitalizeFirstLetter(string: string): string {
+  return string.charAt(0).toUpperCase() + string.slice(1);
 }
diff --git a/src/lib/scripts/NBTParser.ts b/src/lib/server/helper/NotEnoughUpdates/NBTParser.ts
similarity index 100%
rename from src/lib/scripts/NBTParser.ts
rename to src/lib/server/helper/NotEnoughUpdates/NBTParser.ts
diff --git a/src/lib/scripts/parseNEURepository.ts b/src/lib/server/helper/NotEnoughUpdates/parseNEURepository.ts
similarity index 52%
rename from src/lib/scripts/parseNEURepository.ts
rename to src/lib/server/helper/NotEnoughUpdates/parseNEURepository.ts
index 958d5d00..0a4e84e7 100644
--- a/src/lib/scripts/parseNEURepository.ts
+++ b/src/lib/server/helper/NotEnoughUpdates/parseNEURepository.ts
@@ -1,38 +1,38 @@
 import type { NEUItem } from "$types/processed/NotEnoughUpdates/NotEnoughUpdates";
 import fs from "node:fs";
+import { formatBestiaryConstants } from "./parsers/bestiary";
 import { NBTParser } from "./NBTParser";
-import { formatBestiaryConstants } from "./NotEnoughUpdates/bestiary";
 
 export const NEU_ITEMS = new Map<string, NEUItem>();
 export const NEU_CONSTANTS = new Map();
 
 export async function parseNEURepository() {
   const timeNow = performance.now();
-  if (!fs.existsSync("src/lib/constants/NotEnoughUpdates-REPO/items")) {
-    throw new Error("Couldn't find the NEU items directory (src/lib/constants/NotEnoughUpdates-REPO/items). Make sure you have the NEU repository cloned in the correct location.");
+  if (!fs.existsSync("src/lib/server/constants/NotEnoughUpdates-REPO/items")) {
+    throw new Error("Couldn't find the NEU items directory (src/lib/server/constants/NotEnoughUpdates-REPO/items). Make sure you have the NEU repository cloned in the correct location.");
   }
 
-  const items = fs.readdirSync("src/lib/constants/NotEnoughUpdates-REPO/items");
+  const items = fs.readdirSync("src/lib/server/constants/NotEnoughUpdates-REPO/items");
   for (const item of items) {
-    const itemData = JSON.parse(fs.readFileSync(`src/lib/constants/NotEnoughUpdates-REPO/items/${item}`, "utf8"));
+    const itemData = JSON.parse(fs.readFileSync(`src/lib/server/constants/NotEnoughUpdates-REPO/items/${item}`, "utf8"));
 
     itemData.nbttag = NBTParser.parse(itemData.nbttag);
 
     NEU_ITEMS.set(itemData.internalname, itemData);
   }
 
-  const constants = fs.readdirSync("src/lib/constants/NotEnoughUpdates-REPO/constants");
+  const constants = fs.readdirSync("src/lib/server/constants/NotEnoughUpdates-REPO/constants");
   for (const constant of constants) {
     if (constant === "petnums.json") {
-      const petNums = JSON.parse(fs.readFileSync(`src/lib/constants/NotEnoughUpdates-REPO/constants/${constant}`, "utf8"));
+      const petNums = JSON.parse(fs.readFileSync(`src/lib/server/constants/NotEnoughUpdates-REPO/constants/${constant}`, "utf8"));
 
       NEU_CONSTANTS.set("petnums", petNums);
     } else if (constant === "pets.json") {
-      const pets = JSON.parse(fs.readFileSync(`src/lib/constants/NotEnoughUpdates-REPO/constants/${constant}`, "utf8"));
+      const pets = JSON.parse(fs.readFileSync(`src/lib/server/constants/NotEnoughUpdates-REPO/constants/${constant}`, "utf8"));
 
       NEU_CONSTANTS.set("pets", pets);
     } else if (constant === "bestiary.json") {
-      const bestiary = JSON.parse(fs.readFileSync(`src/lib/constants/NotEnoughUpdates-REPO/constants/${constant}`, "utf8"));
+      const bestiary = JSON.parse(fs.readFileSync(`src/lib/server/constants/NotEnoughUpdates-REPO/constants/${constant}`, "utf8"));
 
       const bestiaryData = formatBestiaryConstants(bestiary);
 
diff --git a/src/lib/scripts/NotEnoughUpdates/bestiary.ts b/src/lib/server/helper/NotEnoughUpdates/parsers/bestiary.ts
similarity index 97%
rename from src/lib/scripts/NotEnoughUpdates/bestiary.ts
rename to src/lib/server/helper/NotEnoughUpdates/parsers/bestiary.ts
index 3cda17b6..7f0ab4e7 100644
--- a/src/lib/scripts/NotEnoughUpdates/bestiary.ts
+++ b/src/lib/server/helper/NotEnoughUpdates/parsers/bestiary.ts
@@ -1,4 +1,4 @@
-import { getHeadTextureUUID } from "$lib/helper";
+import { getHeadTextureUUID } from "$lib/server/helper";
 import type { NotEnoughUpdatesBestiaryConstants } from "$types/processed/NotEnoughUpdates/bestiary";
 import type { IslandData, Mob, NotEnoughUpdatesBestiary } from "$types/raw/NotEnoughUpdates/bestiary";
 
diff --git a/src/lib/scripts/updateNEURepository.ts b/src/lib/server/helper/NotEnoughUpdates/updateNEURepository.ts
similarity index 89%
rename from src/lib/scripts/updateNEURepository.ts
rename to src/lib/server/helper/NotEnoughUpdates/updateNEURepository.ts
index a0a963ce..18990862 100644
--- a/src/lib/scripts/updateNEURepository.ts
+++ b/src/lib/server/helper/NotEnoughUpdates/updateNEURepository.ts
@@ -1,6 +1,6 @@
 import { simpleGit } from "simple-git";
 
-const gitSubmodule = simpleGit("src/lib/constants/NotEnoughUpdates-REPO");
+const gitSubmodule = simpleGit("src/lib/server/constants/NotEnoughUpdates-REPO");
 
 export async function updateNotEnoughUpdatesRepository() {
   try {
diff --git a/src/lib/helper/cache.ts b/src/lib/server/helper/cache.ts
similarity index 100%
rename from src/lib/helper/cache.ts
rename to src/lib/server/helper/cache.ts
diff --git a/src/lib/hashes.ts b/src/lib/server/helper/hashes.ts
similarity index 100%
rename from src/lib/hashes.ts
rename to src/lib/server/helper/hashes.ts
diff --git a/src/lib/helper/item.ts b/src/lib/server/helper/item.ts
similarity index 100%
rename from src/lib/helper/item.ts
rename to src/lib/server/helper/item.ts
diff --git a/src/lib/server/lib.ts b/src/lib/server/lib.ts
index c4ea28d3..65ef1434 100644
--- a/src/lib/server/lib.ts
+++ b/src/lib/server/lib.ts
@@ -2,7 +2,7 @@ import { HYPIXEL_API_KEY } from "$env/static/private";
 import { isPlayer } from "$params/player";
 import { isUUID } from "$params/uuid";
 import type { Profile, ProfilesResponse } from "$types/global";
-import { SkyCryptError } from "../constants/error";
+import { SkyCryptError } from "./constants/error";
 import { REDIS } from "./db/redis";
 
 const headers = { Accept: "application/json", "User-Agent": "SkyCrypt", "API-KEY": HYPIXEL_API_KEY };
diff --git a/src/lib/server/lib/stats.ts b/src/lib/server/stats.ts
similarity index 100%
rename from src/lib/server/lib/stats.ts
rename to src/lib/server/stats.ts
diff --git a/src/lib/server/stats/accessories.ts b/src/lib/server/stats/accessories.ts
index 82f6ff9c..c35bfbdf 100644
--- a/src/lib/server/stats/accessories.ts
+++ b/src/lib/server/stats/accessories.ts
@@ -1,8 +1,8 @@
-import * as constants from "$constants/constants";
-import * as helper from "$lib/helper";
+import * as constants from "$lib/server/constants/constants";
+import * as helper from "$lib/server/helper";
 import { itemSorter } from "$lib/server/stats/items/processing";
+import { getMissingAccessories } from "$lib/server/stats/missing";
 import type { Accessories, Accessory, AccessoryRarities, Member, ProcessedItem } from "$types/global";
-import { getMissingAccessories } from "$lib/stats/missing";
 
 export async function getAccessories(userProfile: Member, armor: ProcessedItem[], accessoryBag: ProcessedItem[], inventory: ProcessedItem[], enderchest: ProcessedItem[], storage: ProcessedItem[]) {
   const output = {
diff --git a/src/lib/stats/bestiary.ts b/src/lib/server/stats/bestiary.ts
similarity index 97%
rename from src/lib/stats/bestiary.ts
rename to src/lib/server/stats/bestiary.ts
index 16d2f4de..410d3fcc 100644
--- a/src/lib/stats/bestiary.ts
+++ b/src/lib/server/stats/bestiary.ts
@@ -1,4 +1,4 @@
-import { NEU_CONSTANTS } from "$lib/scripts/parseNEURepository";
+import { NEU_CONSTANTS } from "$lib/server/helper/NotEnoughUpdates/parseNEURepository";
 import type { Member } from "$types/global";
 import type { NotEnoughUpdatesBestiaryConstants } from "$types/processed/NotEnoughUpdates/bestiary";
 import type { BestiaryStats } from "$types/processed/profile/bestiary";
diff --git a/src/lib/stats/collections.ts b/src/lib/server/stats/collections.ts
similarity index 97%
rename from src/lib/stats/collections.ts
rename to src/lib/server/stats/collections.ts
index c6832838..f6128ff0 100644
--- a/src/lib/stats/collections.ts
+++ b/src/lib/server/stats/collections.ts
@@ -1,7 +1,7 @@
-import type { Collections, Member, Profile } from "$types/global";
-import * as constants from "$constants/constants";
+import * as constants from "$lib/server/constants/constants";
 import { COLLECTIONS } from "$lib/server/constants/update-collections";
 import { getUsername } from "$lib/server/lib";
+import type { Collections, Member, Profile } from "$types/global";
 
 export async function getCollections(userProfile: Member, profile: Profile) {
   const output = { categories: {} } as Collections;
diff --git a/src/lib/stats/crimson_isle.ts b/src/lib/server/stats/crimson_isle.ts
similarity index 89%
rename from src/lib/stats/crimson_isle.ts
rename to src/lib/server/stats/crimson_isle.ts
index 5c1ef707..08a6367d 100644
--- a/src/lib/stats/crimson_isle.ts
+++ b/src/lib/server/stats/crimson_isle.ts
@@ -1,6 +1,5 @@
-import * as constants from "$constants/constants";
+import * as constants from "$lib/server/constants/constants";
 import type { Member } from "$types/global";
-import prettyMilliseconds from "pretty-ms";
 
 function getDojoRank(points: number) {
   if (points >= 1000) {
@@ -27,7 +26,6 @@ function getDojo(userProfile: Member) {
       texture: data.texture,
       points: userProfile.nether_island_player_data?.dojo?.[`dojo_points_${id}`] ?? 0,
       time: userProfile.nether_island_player_data?.dojo?.[`dojo_time_${id}`] ?? 0,
-      formattedTime: prettyMilliseconds(userProfile.nether_island_player_data?.dojo?.[`dojo_time_${id}`] ?? 0, { colonNotation: true }),
       rank: getDojoRank(userProfile.nether_island_player_data?.dojo?.[`dojo_points_${id}`] ?? 0)
     });
   }
diff --git a/src/lib/stats/dungeons.ts b/src/lib/server/stats/dungeons.ts
similarity index 98%
rename from src/lib/stats/dungeons.ts
rename to src/lib/server/stats/dungeons.ts
index d02dafd2..93d8ad1a 100644
--- a/src/lib/stats/dungeons.ts
+++ b/src/lib/server/stats/dungeons.ts
@@ -1,5 +1,5 @@
-import * as constants from "$constants/constants";
-import * as helper from "$lib/helper";
+import * as constants from "$lib/server/constants/constants";
+import * as helper from "$lib/server/helper";
 import type { BestRun, Catacombs, Member, Skill } from "$types/global";
 import { getBestiaryFamily } from "./bestiary";
 import { getLevelByXp } from "./leveling/leveling";
diff --git a/src/lib/stats/enchanting.ts b/src/lib/server/stats/enchanting.ts
similarity index 95%
rename from src/lib/stats/enchanting.ts
rename to src/lib/server/stats/enchanting.ts
index 2e472e10..b4542bb7 100644
--- a/src/lib/stats/enchanting.ts
+++ b/src/lib/server/stats/enchanting.ts
@@ -1,4 +1,4 @@
-import * as constants from "$constants/constants";
+import * as constants from "$lib/server/constants/constants";
 import type { Member } from "$types/global";
 import type { Enchanting } from "$types/processed/profile/enchanting";
 
diff --git a/src/lib/stats/farming.ts b/src/lib/server/stats/farming.ts
similarity index 98%
rename from src/lib/stats/farming.ts
rename to src/lib/server/stats/farming.ts
index aba291dc..a6ad693e 100644
--- a/src/lib/stats/farming.ts
+++ b/src/lib/server/stats/farming.ts
@@ -1,4 +1,4 @@
-import * as constants from "$constants/constants";
+import * as constants from "$lib/server/constants/constants";
 import type { Contest, Farming, Medal, Member, Profile } from "$types/global";
 import { createFarmingWeightCalculator } from "farming-weight";
 
diff --git a/src/lib/stats/fishing.ts b/src/lib/server/stats/fishing.ts
similarity index 95%
rename from src/lib/stats/fishing.ts
rename to src/lib/server/stats/fishing.ts
index c6b6ceab..e14c7f53 100644
--- a/src/lib/stats/fishing.ts
+++ b/src/lib/server/stats/fishing.ts
@@ -1,5 +1,5 @@
-import * as constants from "$constants/constants";
-import * as helper from "$lib/helper";
+import * as constants from "$lib/server/constants/constants";
+import * as helper from "$lib/server/helper";
 import type { Member } from "$types/global";
 import type { TrophyFish } from "$types/stats";
 
diff --git a/src/lib/stats/hotm.ts b/src/lib/server/stats/hotm.ts
similarity index 96%
rename from src/lib/stats/hotm.ts
rename to src/lib/server/stats/hotm.ts
index 515e4198..f4efa2f0 100644
--- a/src/lib/stats/hotm.ts
+++ b/src/lib/server/stats/hotm.ts
@@ -1,7 +1,7 @@
-import { getLevelByXp } from "$lib/stats/leveling/leveling";
+import * as constants from "$lib/server/constants/constants";
+import * as helper from "$lib/server/helper";
+import { getLevelByXp } from "$lib/server/stats/leveling/leveling";
 import type { Member, NodeData, ProcessedItem } from "$types/global";
-import * as constants from "$constants/constants";
-import * as helper from "$lib/helper";
 import { calcHotmTokens } from "./mining";
 
 export function getHotmItems(userProfile: Member) {
diff --git a/src/lib/stats/items.ts b/src/lib/server/stats/items.ts
similarity index 94%
rename from src/lib/stats/items.ts
rename to src/lib/server/stats/items.ts
index 001dc239..805923f9 100644
--- a/src/lib/stats/items.ts
+++ b/src/lib/server/stats/items.ts
@@ -1,10 +1,10 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
-import type { Items, Member, ProcessedItem } from "$types/global";
+import { getArmor } from "$lib/server/stats/items/armor";
+import { getEquipment } from "$lib/server/stats/items/equipment";
 import { processItems } from "$lib/server/stats/items/processing";
-import { getWardrobe } from "$lib/stats/items/wardrobe";
-import { getArmor } from "$lib/stats/items/armor";
-import { getEquipment } from "$lib/stats/items/equipment";
+import { getWardrobe } from "$lib/server/stats/items/wardrobe";
+import type { Items, Member, ProcessedItem } from "$types/global";
 import { getPets, getSkilllTools, getWeapons } from "./items/category";
 
 export async function getItems(userProfile: Member): Items {
diff --git a/src/lib/stats/items/armor.ts b/src/lib/server/stats/items/armor.ts
similarity index 96%
rename from src/lib/stats/items/armor.ts
rename to src/lib/server/stats/items/armor.ts
index 950da2d4..ace5f35a 100644
--- a/src/lib/stats/items/armor.ts
+++ b/src/lib/server/stats/items/armor.ts
@@ -1,6 +1,6 @@
+import * as constants from "$lib/server/constants/constants";
+import * as helper from "$lib/server/helper";
 import type { ProcessedItem } from "$types/stats.js";
-import * as constants from "$constants/constants";
-import * as helper from "$lib/helper";
 import { getStatsFromItems } from "./stats";
 
 export function getArmor(armor: ProcessedItem[]) {
diff --git a/src/lib/stats/items/category.ts b/src/lib/server/stats/items/category.ts
similarity index 96%
rename from src/lib/stats/items/category.ts
rename to src/lib/server/stats/items/category.ts
index 3e0e82ef..23c36b8c 100644
--- a/src/lib/stats/items/category.ts
+++ b/src/lib/server/stats/items/category.ts
@@ -1,6 +1,6 @@
+import * as constants from "$lib/server/constants/constants";
+import * as helper from "$lib/server/helper";
 import { itemSorter } from "$lib/server/stats/items/processing";
-import * as constants from "$constants/constants";
-import * as helper from "$lib/helper";
 import type { ProcessedItem } from "$types/stats";
 
 export function getCategory(allItems: ProcessedItem[], category: string) {
diff --git a/src/lib/stats/items/equipment.ts b/src/lib/server/stats/items/equipment.ts
similarity index 91%
rename from src/lib/stats/items/equipment.ts
rename to src/lib/server/stats/items/equipment.ts
index 36d301cd..ff5c4875 100644
--- a/src/lib/stats/items/equipment.ts
+++ b/src/lib/server/stats/items/equipment.ts
@@ -1,6 +1,6 @@
+import * as helper from "$lib/server/helper";
 import type { ProcessedItem } from "$types/stats";
 import { getStatsFromItems } from "./stats";
-import * as helper from "$lib/helper";
 
 export function getEquipment(equipment: ProcessedItem[]) {
   if (equipment.some((a) => helper.getId(a) === "") === true) {
diff --git a/src/lib/server/stats/items/processing.ts b/src/lib/server/stats/items/processing.ts
index ba1cb881..1005e547 100644
--- a/src/lib/server/stats/items/processing.ts
+++ b/src/lib/server/stats/items/processing.ts
@@ -1,17 +1,19 @@
 import { getTexture } from "$lib/custom_resources";
 import { getItemNetworth } from "skyhelper-networth";
 
-import * as constants from "$constants/constants";
+import * as constants from "$lib/server/constants/constants";
+import * as helper from "$lib/server/helper";
 import minecraftData from "minecraft-data";
-import * as helper from "$lib/helper";
 const mcData = minecraftData("1.8.9");
 
+import { getUsername } from "$lib/server/lib";
+import type { StatsData } from "$types/processed/profile/stats";
+import type { GemTier, Gemstone, Item, ProcessedItem } from "$types/stats";
 import nbt, { parse } from "prismarine-nbt";
 import { v4 } from "uuid";
-import type { GemTier, Gemstone, Item, ProcessedItem } from "$types/stats";
-import type { StatsData } from "$types/processed/profile/stats";
-import { getUsername } from "$lib/server/lib";
+import { formatNumber } from "$lib/shared/helper";
 
+import { STATS_DATA } from "$lib/shared/constants/stats";
 export function itemSorter(a: ProcessedItem, b: ProcessedItem) {
   if (a.rarity !== b.rarity) {
     return constants.RARITIES.indexOf(b.rarity) - constants.RARITIES.indexOf(a.rarity);
@@ -166,7 +168,7 @@ export function generateGemLore(type: string, tier: string, rarity: string): str
         }
 
         if (statValue) {
-          const statsData = constants.STATS_DATA[stat as keyof typeof constants.STATS_DATA] as unknown as StatsData;
+          const statsData = STATS_DATA[stat as keyof typeof STATS_DATA] as unknown as StatsData;
 
           stats.push(["§", statsData.color, "+", statValue, " ", statsData.symbol].join(""));
         } else {
@@ -631,7 +633,7 @@ export async function processItems(base64: string, source: string, customTexture
       try {
         const ITEM_PRICE = await getItemNetworth(item, { cache: true });
         if (ITEM_PRICE?.price > 0) {
-          itemLore.push("", `§7Item Value: §6${Math.round(ITEM_PRICE.price).toLocaleString()} Coins §7(§6${helper.formatNumber(ITEM_PRICE.price)}§7)`);
+          itemLore.push("", `§7Item Value: §6${Math.round(ITEM_PRICE.price).toLocaleString()} Coins §7(§6${formatNumber(ITEM_PRICE.price)}§7)`);
         }
       } catch (error) {
         console.log(error);
diff --git a/src/lib/stats/items/stats.ts b/src/lib/server/stats/items/stats.ts
similarity index 77%
rename from src/lib/stats/items/stats.ts
rename to src/lib/server/stats/items/stats.ts
index 3bbf26a2..cd0dfcca 100644
--- a/src/lib/stats/items/stats.ts
+++ b/src/lib/server/stats/items/stats.ts
@@ -1,5 +1,5 @@
-import * as constants from "$constants/constants";
-import { getRawLore } from "$lib/helper";
+import { getRawLore } from "$lib/server/helper";
+import { STATS_DATA } from "$lib/shared/constants/stats";
 import type { ItemStats } from "$types/processed/profile/stats";
 import type { ProcessedItem } from "$types/stats";
 
@@ -20,7 +20,7 @@ export function getStatsFromItem(item: ProcessedItem) {
       continue;
     }
 
-    const statName = Object.keys(constants.STATS_DATA).find((key) => constants.STATS_DATA[key].nameLore === match[1]);
+    const statName = Object.keys(STATS_DATA).find((key) => STATS_DATA[key].nameLore === match[1]);
     const statValue = parseFloat(match[2].replace(/,/g, ""));
     if (statName) {
       stats[statName] = 0;
@@ -39,8 +39,9 @@ export function getStatsFromItems(items: ProcessedItem[]) {
     for (const stat in itemStats) {
       stats[stat] ??= 0;
 
-      // @ts-expect-error: Object is possibly 'null'.
-      stats[stat] += itemStats[stat];
+      if (itemStats[stat] !== undefined) {
+        stats[stat] += itemStats[stat];
+      }
     }
   }
 
diff --git a/src/lib/stats/items/wardrobe.ts b/src/lib/server/stats/items/wardrobe.ts
similarity index 93%
rename from src/lib/stats/items/wardrobe.ts
rename to src/lib/server/stats/items/wardrobe.ts
index 114e9054..6d5d3bfc 100644
--- a/src/lib/stats/items/wardrobe.ts
+++ b/src/lib/server/stats/items/wardrobe.ts
@@ -1,5 +1,5 @@
+import * as helper from "$lib/server/helper";
 import type { ProcessedItem } from "$types/stats";
-import * as helper from "$lib/helper";
 
 export function getWardrobe(wardrobeInventory: ProcessedItem[]) {
   const wardrobeColumns = wardrobeInventory.length / 4;
diff --git a/src/lib/stats/leveling/leveling.ts b/src/lib/server/stats/leveling/leveling.ts
similarity index 99%
rename from src/lib/stats/leveling/leveling.ts
rename to src/lib/server/stats/leveling/leveling.ts
index 8a751ab6..6115d98b 100644
--- a/src/lib/stats/leveling/leveling.ts
+++ b/src/lib/server/stats/leveling/leveling.ts
@@ -1,4 +1,4 @@
-import * as constants from "$lib/constants/skills";
+import * as constants from "$lib/server/constants/skills";
 import type { Member, Profile } from "$types/global";
 import type { Player } from "$types/raw/player/lib";
 import type { Extra } from "$types/stats";
diff --git a/src/lib/stats/main_stats.ts b/src/lib/server/stats/main_stats.ts
similarity index 96%
rename from src/lib/stats/main_stats.ts
rename to src/lib/server/stats/main_stats.ts
index a233e444..8f0ea142 100644
--- a/src/lib/stats/main_stats.ts
+++ b/src/lib/server/stats/main_stats.ts
@@ -1,6 +1,6 @@
-import { FAIRY_SOULS } from "../constants/constants";
-import type { Profile, Member, Items } from "$types/global";
+import type { Items, Member, Profile } from "$types/global";
 import { getPreDecodedNetworth } from "skyhelper-networth";
+import { FAIRY_SOULS } from "../constants/constants";
 
 export async function getMainStats(userProfile: Member, profile: Profile, items: Items) {
   const bank = profile.banking?.balance ?? 0;
diff --git a/src/lib/stats/mining.ts b/src/lib/server/stats/mining.ts
similarity index 97%
rename from src/lib/stats/mining.ts
rename to src/lib/server/stats/mining.ts
index ce9d76a1..bf8cc480 100644
--- a/src/lib/stats/mining.ts
+++ b/src/lib/server/stats/mining.ts
@@ -1,5 +1,5 @@
-import * as constants from "$constants/constants";
-import { getLevelByXp } from "$lib/stats/leveling/leveling";
+import * as constants from "$lib/server/constants/constants";
+import { getLevelByXp } from "$lib/server/stats/leveling/leveling";
 import type { Member } from "$types/global";
 import type { Player } from "$types/raw/player/lib";
 import { getHotmItems } from "./hotm";
diff --git a/src/lib/stats/minions.ts b/src/lib/server/stats/minions.ts
similarity index 96%
rename from src/lib/stats/minions.ts
rename to src/lib/server/stats/minions.ts
index 28ff17d3..b4a5476e 100644
--- a/src/lib/stats/minions.ts
+++ b/src/lib/server/stats/minions.ts
@@ -1,6 +1,6 @@
+import * as constants from "$lib/server/constants/constants";
+import * as helper from "$lib/server/helper";
 import type { Profile } from "$types/global";
-import * as constants from "$constants/constants";
-import * as helper from "$lib/helper";
 import type { MinionCategory, MinionCategoryType, Minions } from "$types/processed/profile/minions";
 
 function getMinionSlots(profile: Profile, tiers: number) {
diff --git a/src/lib/stats/misc.ts b/src/lib/server/stats/misc.ts
similarity index 98%
rename from src/lib/stats/misc.ts
rename to src/lib/server/stats/misc.ts
index 20df2dd1..d637a8bf 100644
--- a/src/lib/stats/misc.ts
+++ b/src/lib/server/stats/misc.ts
@@ -1,5 +1,5 @@
-import * as constants from "$constants/constants";
-import * as helper from "$lib/helper";
+import * as constants from "$lib/server/constants/constants";
+import * as helper from "$lib/server/helper";
 import type { Member, Misc, Profile } from "$types/global";
 import type { Player } from "$types/raw/player/lib";
 
diff --git a/src/lib/stats/missing.ts b/src/lib/server/stats/missing.ts
similarity index 96%
rename from src/lib/stats/missing.ts
rename to src/lib/server/stats/missing.ts
index d5f2477e..36b33781 100644
--- a/src/lib/stats/missing.ts
+++ b/src/lib/server/stats/missing.ts
@@ -1,5 +1,6 @@
-import * as constants from "$constants/constants";
-import * as helper from "$lib/helper";
+import * as constants from "$lib/server/constants/constants";
+import * as helper from "$lib/server/helper";
+import { formatNumber } from "$lib/shared/helper";
 import type { AccessoriesOutput, Member } from "$types/global";
 import type { Accessories, Accessory, ProcessedItem, SpecialAccessory } from "$types/stats";
 import { getStatsFromItems } from "./items/stats";
@@ -141,7 +142,7 @@ export async function getMissingAccessories(items: Accessories, userProfile: Mem
 
       item.extra = { price };
       if (price > 0) {
-        helper.addToItemLore(item, `§7Price: §6${Math.round(price).toLocaleString()} Coins §7(§6${helper.formatNumber(Math.floor(price / helper.getMagicalPower(item.rarity, item.id)))} §7per MP)`);
+        helper.addToItemLore(item, `§7Price: §6${Math.round(price).toLocaleString()} Coins §7(§6${formatNumber(Math.floor(price / helper.getMagicalPower(item.rarity, item.id)))} §7per MP)`);
       }
 
       item.tag ??= {};
diff --git a/src/lib/stats/pets.ts b/src/lib/server/stats/pets.ts
similarity index 94%
rename from src/lib/stats/pets.ts
rename to src/lib/server/stats/pets.ts
index 85f8ed1c..d0737799 100644
--- a/src/lib/stats/pets.ts
+++ b/src/lib/server/stats/pets.ts
@@ -1,6 +1,7 @@
-import * as constants from "$constants/constants";
-import * as helper from "$lib/helper";
-import { NEU_CONSTANTS, NEU_ITEMS } from "$lib/scripts/parseNEURepository";
+import * as constants from "$lib/server/constants/constants";
+import * as helper from "$lib/server/helper";
+import { NEU_CONSTANTS, NEU_ITEMS } from "$lib/server/helper/NotEnoughUpdates/parseNEURepository";
+import { formatNumber, uniqBy } from "$lib/shared/helper";
 import type { Member, Pet, Pets, ProcessedItem, ProcessedPet, Profile } from "$types/global";
 import { getItemNetworth } from "skyhelper-networth";
 
@@ -213,15 +214,15 @@ function getProfilePets(pets: Pet[]) {
 
       const progress = Math.ceil(outputPet.level.progress * 20);
       const numerator = Math.floor(outputPet.level.currentXp).toLocaleString();
-      const denominator = helper.formatNumber(outputPet.level.xpForNext);
+      const denominator = formatNumber(outputPet.level.xpForNext);
 
       outputPet.lore.push(`§2${"-".repeat(progress)}§f${"-".repeat(20 - progress)} §e${numerator} §6/ §e${denominator}`);
     }
 
-    outputPet.lore.push(``, `§7Total XP: §e${helper.formatNumber(outputPet.level.xp, 1)} §6/ §e${helper.formatNumber(outputPet.level.xpMaxLevel)} §6(100%)`, `§7Candy Used: §e${pet.candyUsed ?? 0} §6/ §e10`);
+    outputPet.lore.push(``, `§7Total XP: §e${formatNumber(outputPet.level.xp, 1)} §6/ §e${formatNumber(outputPet.level.xpMaxLevel)} §6(100%)`, `§7Candy Used: §e${pet.candyUsed ?? 0} §6/ §e10`);
 
     if (outputPet.price && outputPet.price > 0) {
-      outputPet.lore.push(``, `§7Item Value: §6${Math.floor(outputPet.price).toLocaleString()} Coins §7(§6${helper.formatNumber(outputPet.price)}§7)`);
+      outputPet.lore.push(``, `§7Item Value: §6${Math.floor(outputPet.price).toLocaleString()} Coins §7(§6${formatNumber(outputPet.price)}§7)`);
     }
 
     outputPet.lore = outputPet.lore.filter((line, index, self) => {
@@ -359,11 +360,11 @@ export async function getPets(userProfile: Member, items: ProcessedItem[], profi
   output.missing = getMissingPets(output.pets, profile.game_mode);
 
   const maxPetIds = getMaxPetIds();
-  output.amount = helper.uniqBy(output.pets, "type").length;
+  output.amount = uniqBy(output.pets, "type").length;
   const totalPets = profile.game_mode === "bingo" ? Object.keys(maxPetIds) : Object.keys(maxPetIds).filter((pet) => pet !== "BINGO");
   output.total = totalPets.length;
 
-  output.amountSkins = helper.uniqBy(output.pets, "skin").length;
+  output.amountSkins = uniqBy(output.pets, "skin").length;
   output.totalSkins = getPetSkins().length;
 
   output.petScore = getPetScore(output.pets);
diff --git a/src/lib/stats/rank.ts b/src/lib/server/stats/rank.ts
similarity index 100%
rename from src/lib/stats/rank.ts
rename to src/lib/server/stats/rank.ts
index 5e823e83..0dc29034 100644
--- a/src/lib/stats/rank.ts
+++ b/src/lib/server/stats/rank.ts
@@ -1,6 +1,6 @@
-import { RANKS, RANK_PLUS_COLORS } from "../constants/constants";
 import type { PlusColor, Rank, RankName } from "$types/processed/profile/rank";
 import type { Player } from "$types/raw/player/lib";
+import { RANKS, RANK_PLUS_COLORS } from "../constants/constants";
 
 export function getRank(player: Player): Rank | undefined {
   const rank = getRankName(player);
diff --git a/src/lib/stats/rift.ts b/src/lib/server/stats/rift.ts
similarity index 96%
rename from src/lib/stats/rift.ts
rename to src/lib/server/stats/rift.ts
index ad1f1f50..ba6ec2d9 100644
--- a/src/lib/stats/rift.ts
+++ b/src/lib/server/stats/rift.ts
@@ -1,4 +1,4 @@
-import * as constants from "$constants/constants";
+import * as constants from "$lib/server/constants/constants";
 import type { Member } from "$types/global";
 
 function getTimecharms(userProfile: Member) {
diff --git a/src/lib/stats/skills.ts b/src/lib/server/stats/skills.ts
similarity index 100%
rename from src/lib/stats/skills.ts
rename to src/lib/server/stats/skills.ts
index 59210416..9d3a0e30 100644
--- a/src/lib/stats/skills.ts
+++ b/src/lib/server/stats/skills.ts
@@ -1,6 +1,6 @@
-import * as constants from "../constants/constants";
 import type { Member, Profile, Skills, SkillsData } from "$types/global";
 import type { Player } from "$types/raw/player/lib";
+import * as constants from "../constants/constants";
 import { getLevelByXp, getSkillLevelCaps, getSocialSkillExperience, getXpByLevel } from "./leveling/leveling";
 
 export function getSkills(userProfile: Member, profile: Profile, player: Player): Skills {
diff --git a/src/lib/stats/skyblock_level.ts b/src/lib/server/stats/skyblock_level.ts
similarity index 100%
rename from src/lib/stats/skyblock_level.ts
rename to src/lib/server/stats/skyblock_level.ts
diff --git a/src/lib/stats/slayer.ts b/src/lib/server/stats/slayer.ts
similarity index 87%
rename from src/lib/stats/slayer.ts
rename to src/lib/server/stats/slayer.ts
index a1b9b1eb..3f008063 100644
--- a/src/lib/stats/slayer.ts
+++ b/src/lib/server/stats/slayer.ts
@@ -1,4 +1,5 @@
-import * as constants from "$constants/constants";
+import * as constants from "$lib/server/constants/constants";
+import { getBonusStats, STATS_BONUS } from "$lib/shared/constants/stats";
 import type { Member, SlayerBoss, SlayerData } from "$types/global";
 
 function getKills(slayer: SlayerBoss) {
@@ -76,11 +77,11 @@ export function getSlayer(userProfile: Member) {
 
   const stats = {} as Record<string, number>;
   for (const id in output.data) {
-    const statsBonus = constants.STATS_BONUS[`slayer_${id}`];
+    const statsBonus = STATS_BONUS[`slayer_${id}`];
     const level = output.data[id].level.level;
 
-    for (const stat in constants.getBonusStats(level, statsBonus)) {
-      stats[stat] = (stats[stat] || 0) + constants.getBonusStats(level, statsBonus)[stat];
+    for (const stat in getBonusStats(level, statsBonus)) {
+      stats[stat] = (stats[stat] || 0) + getBonusStats(level, statsBonus)[stat];
     }
   }
 
diff --git a/src/lib/server/stats/stats.ts b/src/lib/server/stats/stats.ts
index 6ac5ae4a..b3430769 100644
--- a/src/lib/server/stats/stats.ts
+++ b/src/lib/server/stats/stats.ts
@@ -1,19 +1,19 @@
 export * from "$lib/server/stats/accessories";
-export * from "$lib/stats/bestiary";
-export * from "$lib/stats/collections";
-export * from "$lib/stats/crimson_isle";
-export * from "$lib/stats/dungeons";
-export * from "$lib/stats/enchanting";
-export * from "$lib/stats/farming";
-export * from "$lib/stats/fishing";
-export * from "$lib/stats/items";
-export * from "$lib/stats/main_stats";
-export * from "$lib/stats/mining";
-export * from "$lib/stats/minions";
-export * from "$lib/stats/misc";
-export * from "$lib/stats/pets";
-export * from "$lib/stats/rank";
-export * from "$lib/stats/rift";
-export * from "$lib/stats/skills";
-export * from "$lib/stats/skyblock_level";
-export * from "$lib/stats/slayer";
+export * from "$lib/server/stats/bestiary";
+export * from "$lib/server/stats/collections";
+export * from "$lib/server/stats/crimson_isle";
+export * from "$lib/server/stats/dungeons";
+export * from "$lib/server/stats/enchanting";
+export * from "$lib/server/stats/farming";
+export * from "$lib/server/stats/fishing";
+export * from "$lib/server/stats/items";
+export * from "$lib/server/stats/main_stats";
+export * from "$lib/server/stats/mining";
+export * from "$lib/server/stats/minions";
+export * from "$lib/server/stats/misc";
+export * from "$lib/server/stats/pets";
+export * from "$lib/server/stats/rank";
+export * from "$lib/server/stats/rift";
+export * from "$lib/server/stats/skills";
+export * from "$lib/server/stats/skyblock_level";
+export * from "$lib/server/stats/slayer";
diff --git a/src/lib/constants/enchantments.ts b/src/lib/shared/constants/enchantments.ts
similarity index 100%
rename from src/lib/constants/enchantments.ts
rename to src/lib/shared/constants/enchantments.ts
diff --git a/src/lib/constants/items.ts b/src/lib/shared/constants/items.ts
similarity index 100%
rename from src/lib/constants/items.ts
rename to src/lib/shared/constants/items.ts
diff --git a/src/lib/constants/stats.ts b/src/lib/shared/constants/stats.ts
similarity index 100%
rename from src/lib/constants/stats.ts
rename to src/lib/shared/constants/stats.ts
diff --git a/src/lib/shared/helper.ts b/src/lib/shared/helper.ts
new file mode 100644
index 00000000..b8e771e3
--- /dev/null
+++ b/src/lib/shared/helper.ts
@@ -0,0 +1,187 @@
+import { MAX_ENCHANTS } from "$lib/shared/constants/enchantments";
+import { RARITY_COLORS } from "$lib/shared/constants/items";
+import type { ProcessedItem } from "$types/global";
+import prettyMilliseconds from "pretty-ms";
+export { prettyMilliseconds as formatTime };
+
+/**
+ * Formats a number using the compact notation (e.g., 1.2K, 3.4M).
+ *
+ * @param n - The number to format.
+ * @param digits - The number of decimal places to include (default is 2).
+ * @returns The formatted number as a string.
+ */
+export function formatNumber(n: number, digits = 2) {
+  return Intl.NumberFormat("en-US", {
+    notation: "compact",
+    minimumFractionDigits: digits,
+    maximumFractionDigits: digits
+  })
+    .format(n)
+    .replace(/\.0+([A-Za-z])?$/, "$1");
+}
+
+/**
+ * Converts a string to title case
+ * @param {string} string
+ * @returns {string}
+ */
+export function titleCase(string: string): string {
+  return string
+    .replaceAll(" ", "_")
+    .toLowerCase()
+    .split("_")
+    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+    .join(" ");
+}
+
+/**
+ * Returns the tailwind css color class for a rarity
+ * @param {string} rarity the rarity of the item
+ * @param {"bg" | "text"} type the type of color to get
+ * @returns {string} the tailwind css color class
+ */
+export function getRarityClass(rarity: string, type: "bg" | "text"): string {
+  const rarityColor = RARITY_COLORS[rarity as keyof typeof RARITY_COLORS];
+  // minecraft colors are safelisted in the tailwind config, so they are always generated
+  return rarityColor ? `${type}-minecraft-${rarityColor}` : "";
+}
+
+/**
+ * Checks if a character is a color code
+ * @param {string} code
+ * @returns {code is ColorCode}
+ */
+function isColorCode(code: string): code is ColorCode {
+  return /[0-9a-f]/.test(code);
+}
+
+/**
+ * Checks if a character is a format code
+ * @param {string} code
+ * @returns {code is FormatCode}
+ */
+function isFormatCode(code: string): code is FormatCode {
+  return /[k-o]/.test(code);
+}
+
+/**
+ * Convert Minecraft lore to HTML
+ * @param {string} text minecraft lore with color and formatting codes
+ * @returns {string} HTML
+ */
+export function renderLore(text: string): string {
+  let output = "";
+
+  let color: ColorCode | null = null;
+  const formats: Set<FormatCode> = new Set();
+
+  const matches = text.match(/(§[0-9A-Fa-fk-orL])*[^§]*/g);
+  if (matches === null) return output;
+  for (let part of matches) {
+    formats.clear();
+    while (part.charAt(0) === "§") {
+      const code = part.charAt(1).toLowerCase();
+
+      if (isColorCode(code)) {
+        color = code;
+      } else if (isFormatCode(code)) {
+        formats.add(code);
+      } else if (code === "r") {
+        color = null;
+        formats.clear();
+      }
+
+      part = part.substring(2);
+    }
+
+    if (part.length === 0) {
+      output += "<br>";
+      continue;
+    }
+
+    const timeRegex = /<local-time timestamp="(\d+)"><\/local-time>/;
+    const timeMatch = part.match(timeRegex);
+    // Delete the timestamp from the lore
+    if (timeMatch) {
+      // part = part.replace(timeRegex, dateFormat(fromUnixTime(obtained), "dd MMMM yyyy 'at' HH:mm"));
+      // TODO: Add the timestamp to the lore
+      part = "TODO: ADD LATER";
+    }
+
+    output += "<span";
+
+    if (color !== null) {
+      if (color == "9" && MAX_ENCHANTS.has(part)) {
+        output += ` style='color: var(--§6)'`;
+      } else {
+        output += ` style='color: var(--§${color});'`;
+      }
+    }
+
+    if (formats.size > 0) {
+      output += ` class='${Array.from(formats, (x) => "§" + x).join(" ")}'`;
+    }
+
+    output += `>${part}</span>`;
+  }
+
+  return output;
+}
+
+/**
+ * Checks if an item is enchanted
+ * @param {Item} item The item to check
+ * @returns  {boolean} Whether the item is enchanted
+ */
+export function isEnchanted(item: ProcessedItem): boolean {
+  // heads
+  if ([397].includes(item.id)) {
+    return false;
+  }
+
+  // enchanted book, bottle o' enchanting, nether star
+  if ([403, 384, 399].includes(item.id)) {
+    return true;
+  }
+
+  //potions with actual effects (not water bottles)
+  if (item.id === 373 && item.Damage !== 0) {
+    return true;
+  }
+
+  if ("tag" in item && Array.isArray(item.tag.ench)) {
+    return true;
+  }
+
+  if (item.glowing) {
+    return true;
+  }
+
+  return false;
+}
+
+/**
+ * Removes Minecraft formatting codes from a string
+ * @param {string} string
+ * @returns {string}
+ */
+export function removeFormatting(string: string): string {
+  return string.replaceAll(/§[0-9a-z]/g, "");
+}
+
+/**
+ * Returns a new array with unique elements based on the specified key.
+ * 
+ * @template T - The type of elements in the array.
+ * @param {T[]} arr - The array to filter for unique elements.
+ * @param {string} key - The key to determine uniqueness.
+ * @returns {T[]} A new array with unique elements based on the specified key.
+ */
+export function uniqBy<T>(arr: T[], key: string) {
+  const seen = new Set();
+  return arr.filter((item) => {
+    const k = (item as Record<string, unknown>)[key];
+    return seen.has(k) ? false : seen.add(k);
+  });
+}
\ No newline at end of file
diff --git a/src/lib/stats/player_stats.ts b/src/lib/shared/player_stats.ts
similarity index 98%
rename from src/lib/stats/player_stats.ts
rename to src/lib/shared/player_stats.ts
index 70c2c80a..1cbcaf77 100644
--- a/src/lib/stats/player_stats.ts
+++ b/src/lib/shared/player_stats.ts
@@ -1,4 +1,4 @@
-import { getBonusStat } from "$constants/stats";
+import { getBonusStat } from "$lib/shared/constants/stats";
 import type { Stats } from "$types/global";
 
 export function getPlayerStats(profile: Stats) {
diff --git a/src/lib/utils.ts b/src/lib/shared/utils.ts
similarity index 100%
rename from src/lib/utils.ts
rename to src/lib/shared/utils.ts
diff --git a/src/lib/tools/formatting.ts b/src/lib/tools/formatting.ts
deleted file mode 100644
index 1f1336e0..00000000
--- a/src/lib/tools/formatting.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { MAX_ENCHANTS } from "$constants/enchantments";
-import { format as timeFormat } from "numerable";
-
-type ColorCode = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" | "a" | "b" | "c" | "d" | "e" | "f";
-type FormatCode = "k" | "l" | "m" | "n" | "o";
-
-/**
- * @param {number|string} number the number to be formatted
- *
- * @returns {string} formatted number
- *
- * @example formatNumber(123456798) = "123.4M"
- */
-export const formatNumber = (num: number | string): string => {
-  // if the number is a string, parse it to a number
-  if (typeof num === "string") {
-    num = parseFloat(num);
-  }
-  // get the second digit
-  const secondDigit = num.toString().charAt(1);
-  // get the third digit
-  const thirdDigit = num.toString().charAt(2);
-  let formatPattern: string;
-  if (secondDigit === "0" && thirdDigit === "0") {
-    formatPattern = "0a";
-  } else if (secondDigit !== "0" && thirdDigit === "0") {
-    formatPattern = "0.0a";
-  } else {
-    formatPattern = "0.00a";
-  }
-  // if number is in trillions, billions, millions, thousands, format it to 1 decimal place if the decimal is 0, otherwise format it to 0 decimal places
-  if (num >= 1000000) {
-    return timeFormat(num, formatPattern);
-  } else {
-    return timeFormat(num, "0a");
-  }
-};
-
-/**
- * Checks if a character is a color code
- * @param {string} code
- * @returns {code is ColorCode}
- */
-function isColorCode(code: string): code is ColorCode {
-  return /[0-9a-f]/.test(code);
-}
-
-/**
- * Checks if a character is a format code
- * @param {string} code
- * @returns {code is FormatCode}
- */
-function isFormatCode(code: string): code is FormatCode {
-  return /[k-o]/.test(code);
-}
-
-/**
- * Convert Minecraft lore to HTML
- * @param {string} text minecraft lore with color and formatting codes
- * @returns {string} HTML
- */
-export function renderLore(text: string): string {
-  let output = "";
-
-  let color: ColorCode | null = null;
-  const formats: Set<FormatCode> = new Set();
-
-  const matches = text.match(/(§[0-9A-Fa-fk-orL])*[^§]*/g);
-  if (matches === null) return output;
-  for (let part of matches) {
-    formats.clear();
-    while (part.charAt(0) === "§") {
-      const code = part.charAt(1).toLowerCase();
-
-      if (isColorCode(code)) {
-        color = code;
-      } else if (isFormatCode(code)) {
-        formats.add(code);
-      } else if (code === "r") {
-        color = null;
-        formats.clear();
-      }
-
-      part = part.substring(2);
-    }
-
-    if (part.length === 0) {
-      output += "<br>";
-      continue;
-    }
-
-    const timeRegex = /<local-time timestamp="(\d+)"><\/local-time>/;
-    const timeMatch = part.match(timeRegex);
-    // Delete the timestamp from the lore
-    if (timeMatch) {
-      // part = part.replace(timeRegex, dateFormat(fromUnixTime(obtained), "dd MMMM yyyy 'at' HH:mm"));
-      // TODO: Add the timestamp to the lore
-      part = "TODO: ADD LATER";
-    }
-
-    output += "<span";
-
-    if (color !== null) {
-      if (color == "9" && MAX_ENCHANTS.has(part)) {
-        output += ` style='color: var(--§6)'`;
-      } else {
-        output += ` style='color: var(--§${color});'`;
-      }
-    }
-
-    if (formats.size > 0) {
-      output += ` class='${Array.from(formats, (x) => "§" + x).join(" ")}'`;
-    }
-
-    output += `>${part}</span>`;
-  }
-
-  return output;
-}
diff --git a/src/lib/tools/helper.ts b/src/lib/tools/helper.ts
deleted file mode 100644
index 7d168d5b..00000000
--- a/src/lib/tools/helper.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import { RARITY_COLORS } from "$constants/items";
-import { STATS_DATA } from "$constants/stats";
-import type { Item, ProcessedItem } from "$types/global";
-import type { ItemStats } from "$types/processed/profile/stats";
-
-/**
- * Removes Minecraft formatting codes from a string
- * @param {string} string
- * @returns {string}
- */
-export function removeFormatting(string: string): string {
-  return string.replaceAll(/§[0-9a-z]/g, "");
-}
-
-/**
- * Gets the stats from an item
- * @param  {Item} piece
- * @returns {ItemStats}
- */
-export function getStatsFromItem(piece: Item): ItemStats {
-  const regex = /^([A-Za-z ]+): ([+-]([0-9]+(?:,[0-9]{3})*(?:\.[0-9]{0,2})?))/;
-  const stats = {} as ItemStats;
-
-  if (!piece) {
-    return stats;
-  }
-
-  const lore = (piece.tag.display?.Lore || []).map((line) => removeFormatting(line));
-
-  for (const line of lore) {
-    const match = regex.exec(line);
-
-    if (match == null) {
-      continue;
-    }
-
-    const statName = Object.keys(STATS_DATA).find((key) => STATS_DATA[key].nameLore === match[1]);
-    const statValue = parseFloat(match[2].replace(/,/g, ""));
-
-    if (statName) {
-      stats[statName] = (stats[statName] || 0) + statValue;
-    }
-  }
-
-  return stats;
-}
-
-/**
- * Capitalizes the first letter of a string
- * @param {string} string
- * @returns {string}
- * @deprecated Use CSS text-transform: capitalize; (capitalize in Tailwind CSS) instead.
- * @DO_NOT_USE
- */
-export function capitalizeFirstLetter(string: string): string {
-  return string.charAt(0).toUpperCase() + string.slice(1);
-}
-
-/**
- * Converts a string to title case
- * @param {string} string
- * @returns {string}
- */
-export function titleCase(string: string): string {
-  const split = string.toLowerCase().split(" ");
-
-  for (let i = 0; i < split.length; i++) {
-    split[i] = split[i].charAt(0).toUpperCase() + split[i].substring(1);
-  }
-
-  return split.join(" ");
-}
-
-/**
- * Rounds a number to a certain number of decimal places
- * @param {number} num the number to be rounded
- * @param {number} decimals the number of decimal places to round to
- * @returns {number} the rounded number
- * @deprecated Use format from "numerable" instead.
- */
-export function round(num: number, decimals: number = 0): number {
-  return Math.round(Math.pow(10, decimals) * num) / Math.pow(10, decimals);
-}
-
-/**
- * Returns the tailwind css color class for a rarity
- * @param {string} rarity the rarity of the item
- * @param {"bg" | "text"} type the type of color to get
- * @returns {string} the tailwind css color class
- */
-export function getRarityClass(rarity: string, type: "bg" | "text"): string {
-  const rarityColor = RARITY_COLORS[rarity as keyof typeof RARITY_COLORS];
-  // minecraft colors are safelisted in the tailwind config, so they are always generated
-  return rarityColor ? `${type}-minecraft-${rarityColor}` : "";
-}
-
-/**
- * Checks if an item is enchanted
- * @param {Item} item The item to check
- * @returns  {boolean} Whether the item is enchanted
- */
-export function isEnchanted(item: ProcessedItem): boolean {
-  // heads
-  if ([397].includes(item.id)) {
-    return false;
-  }
-
-  // enchanted book, bottle o' enchanting, nether star
-  if ([403, 384, 399].includes(item.id)) {
-    return true;
-  }
-
-  //potions with actual effects (not water bottles)
-  if (item.id === 373 && item.Damage !== 0) {
-    return true;
-  }
-
-  if ("tag" in item && Array.isArray(item.tag.ench)) {
-    return true;
-  }
-
-  if (item.glowing) {
-    return true;
-  }
-
-  return false;
-}
diff --git a/src/lib/tools/index.ts b/src/lib/tools/index.ts
deleted file mode 100644
index fbb84d15..00000000
--- a/src/lib/tools/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./formatting";
-export * from "./helper";
diff --git a/src/types/custom-resources.d.ts b/src/lib/types/custom-resources.d.ts
similarity index 100%
rename from src/types/custom-resources.d.ts
rename to src/lib/types/custom-resources.d.ts
diff --git a/src/types/global.d.ts b/src/lib/types/global.d.ts
similarity index 100%
rename from src/types/global.d.ts
rename to src/lib/types/global.d.ts
diff --git a/src/lib/types/helper.d.ts b/src/lib/types/helper.d.ts
new file mode 100644
index 00000000..b3beed76
--- /dev/null
+++ b/src/lib/types/helper.d.ts
@@ -0,0 +1,2 @@
+type ColorCode = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" | "a" | "b" | "c" | "d" | "e" | "f";
+type FormatCode = "k" | "l" | "m" | "n" | "o";
diff --git a/src/types/processed/NotEnoughUpdates/NotEnoughUpdates.d.ts b/src/lib/types/processed/NotEnoughUpdates/NotEnoughUpdates.d.ts
similarity index 100%
rename from src/types/processed/NotEnoughUpdates/NotEnoughUpdates.d.ts
rename to src/lib/types/processed/NotEnoughUpdates/NotEnoughUpdates.d.ts
diff --git a/src/types/processed/NotEnoughUpdates/bestiary.d.ts b/src/lib/types/processed/NotEnoughUpdates/bestiary.d.ts
similarity index 100%
rename from src/types/processed/NotEnoughUpdates/bestiary.d.ts
rename to src/lib/types/processed/NotEnoughUpdates/bestiary.d.ts
diff --git a/src/types/processed/profile/bestiary.d.ts b/src/lib/types/processed/profile/bestiary.d.ts
similarity index 100%
rename from src/types/processed/profile/bestiary.d.ts
rename to src/lib/types/processed/profile/bestiary.d.ts
diff --git a/src/types/processed/profile/collections.d.ts b/src/lib/types/processed/profile/collections.d.ts
similarity index 100%
rename from src/types/processed/profile/collections.d.ts
rename to src/lib/types/processed/profile/collections.d.ts
diff --git a/src/types/processed/profile/crimson_isle.d.ts b/src/lib/types/processed/profile/crimson_isle.d.ts
similarity index 94%
rename from src/types/processed/profile/crimson_isle.d.ts
rename to src/lib/types/processed/profile/crimson_isle.d.ts
index 4bfb3714..ae1dc245 100644
--- a/src/types/processed/profile/crimson_isle.d.ts
+++ b/src/lib/types/processed/profile/crimson_isle.d.ts
@@ -21,7 +21,6 @@ export type CrimsonIsle = {
       texture: string;
       points: number;
       time: number;
-      formattedTime: string;
       rank: string;
     }[];
   };
diff --git a/src/types/processed/profile/dungeons.d.ts b/src/lib/types/processed/profile/dungeons.d.ts
similarity index 100%
rename from src/types/processed/profile/dungeons.d.ts
rename to src/lib/types/processed/profile/dungeons.d.ts
diff --git a/src/types/processed/profile/enchanting.d.ts b/src/lib/types/processed/profile/enchanting.d.ts
similarity index 100%
rename from src/types/processed/profile/enchanting.d.ts
rename to src/lib/types/processed/profile/enchanting.d.ts
diff --git a/src/types/processed/profile/farming.d.ts b/src/lib/types/processed/profile/farming.d.ts
similarity index 100%
rename from src/types/processed/profile/farming.d.ts
rename to src/lib/types/processed/profile/farming.d.ts
diff --git a/src/types/processed/profile/fishing.d.ts b/src/lib/types/processed/profile/fishing.d.ts
similarity index 100%
rename from src/types/processed/profile/fishing.d.ts
rename to src/lib/types/processed/profile/fishing.d.ts
diff --git a/src/types/processed/profile/items.d.ts b/src/lib/types/processed/profile/items.d.ts
similarity index 100%
rename from src/types/processed/profile/items.d.ts
rename to src/lib/types/processed/profile/items.d.ts
diff --git a/src/types/processed/profile/main_stats.d.ts b/src/lib/types/processed/profile/main_stats.d.ts
similarity index 100%
rename from src/types/processed/profile/main_stats.d.ts
rename to src/lib/types/processed/profile/main_stats.d.ts
diff --git a/src/types/processed/profile/mining.d.ts b/src/lib/types/processed/profile/mining.d.ts
similarity index 100%
rename from src/types/processed/profile/mining.d.ts
rename to src/lib/types/processed/profile/mining.d.ts
diff --git a/src/types/processed/profile/minions.d.ts b/src/lib/types/processed/profile/minions.d.ts
similarity index 100%
rename from src/types/processed/profile/minions.d.ts
rename to src/lib/types/processed/profile/minions.d.ts
diff --git a/src/types/processed/profile/misc.d.ts b/src/lib/types/processed/profile/misc.d.ts
similarity index 100%
rename from src/types/processed/profile/misc.d.ts
rename to src/lib/types/processed/profile/misc.d.ts
diff --git a/src/types/processed/profile/pet-stats.d.ts b/src/lib/types/processed/profile/pet-stats.d.ts
similarity index 100%
rename from src/types/processed/profile/pet-stats.d.ts
rename to src/lib/types/processed/profile/pet-stats.d.ts
diff --git a/src/types/processed/profile/pets.d.ts b/src/lib/types/processed/profile/pets.d.ts
similarity index 100%
rename from src/types/processed/profile/pets.d.ts
rename to src/lib/types/processed/profile/pets.d.ts
diff --git a/src/types/processed/profile/rank.d.ts b/src/lib/types/processed/profile/rank.d.ts
similarity index 100%
rename from src/types/processed/profile/rank.d.ts
rename to src/lib/types/processed/profile/rank.d.ts
diff --git a/src/types/processed/profile/rift.d.ts b/src/lib/types/processed/profile/rift.d.ts
similarity index 100%
rename from src/types/processed/profile/rift.d.ts
rename to src/lib/types/processed/profile/rift.d.ts
diff --git a/src/types/processed/profile/skills.d.ts b/src/lib/types/processed/profile/skills.d.ts
similarity index 100%
rename from src/types/processed/profile/skills.d.ts
rename to src/lib/types/processed/profile/skills.d.ts
diff --git a/src/types/processed/profile/slayer.d.ts b/src/lib/types/processed/profile/slayer.d.ts
similarity index 100%
rename from src/types/processed/profile/slayer.d.ts
rename to src/lib/types/processed/profile/slayer.d.ts
diff --git a/src/types/processed/profile/stats.d.ts b/src/lib/types/processed/profile/stats.d.ts
similarity index 100%
rename from src/types/processed/profile/stats.d.ts
rename to src/lib/types/processed/profile/stats.d.ts
diff --git a/src/types/raw/NotEnoughUpdates/bestiary.d.ts b/src/lib/types/raw/NotEnoughUpdates/bestiary.d.ts
similarity index 100%
rename from src/types/raw/NotEnoughUpdates/bestiary.d.ts
rename to src/lib/types/raw/NotEnoughUpdates/bestiary.d.ts
diff --git a/src/types/raw/player/lib.d.ts b/src/lib/types/raw/player/lib.d.ts
similarity index 100%
rename from src/types/raw/player/lib.d.ts
rename to src/lib/types/raw/player/lib.d.ts
diff --git a/src/types/raw/profile/lib.d.ts b/src/lib/types/raw/profile/lib.d.ts
similarity index 100%
rename from src/types/raw/profile/lib.d.ts
rename to src/lib/types/raw/profile/lib.d.ts
diff --git a/src/types/stats.d.ts b/src/lib/types/stats.d.ts
similarity index 100%
rename from src/types/stats.d.ts
rename to src/lib/types/stats.d.ts
diff --git a/src/routes/api/stats/[paramPlayer=player]/+server.ts b/src/routes/api/stats/[paramPlayer=player]/+server.ts
index 882a03ff..2763c675 100644
--- a/src/routes/api/stats/[paramPlayer=player]/+server.ts
+++ b/src/routes/api/stats/[paramPlayer=player]/+server.ts
@@ -1,7 +1,7 @@
-import type { RequestHandler } from "./$types";
-import { json } from "@sveltejs/kit";
 import { fetchPlayer, getProfile } from "$lib/server/lib";
-import { getStats } from "$lib/server/lib/stats";
+import { getStats } from "$lib/server/stats";
+import { json } from "@sveltejs/kit";
+import type { RequestHandler } from "./$types";
 
 export const GET: RequestHandler = async ({ params }) => {
   const timeNow = Date.now();
diff --git a/src/routes/api/stats/[paramPlayer=player]/[paramProfile]/+server.ts b/src/routes/api/stats/[paramPlayer=player]/[paramProfile]/+server.ts
index dd06ab88..d374827c 100644
--- a/src/routes/api/stats/[paramPlayer=player]/[paramProfile]/+server.ts
+++ b/src/routes/api/stats/[paramPlayer=player]/[paramProfile]/+server.ts
@@ -1,7 +1,7 @@
-import type { RequestHandler } from "./$types";
-import { json } from "@sveltejs/kit";
 import { fetchPlayer, getProfile } from "$lib/server/lib";
-import { getStats } from "$lib/server/lib/stats";
+import { getStats } from "$lib/server/stats";
+import { json } from "@sveltejs/kit";
+import type { RequestHandler } from "./$types";
 
 export const GET: RequestHandler = async ({ params }) => {
   const timeNow = Date.now();
diff --git a/svelte.config.js b/svelte.config.js
index 9f2d9c06..8b890c73 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -14,9 +14,9 @@ const config = {
     adapter: adapter(),
     alias: {
       $params: "./src/params",
-      $types: "./src/types",
+      $types: "./src/lib/types",
       $db: "./src/db",
-      $constants: "./src/lib/constants"
+      $constants: "./src/lib/server/constants"
     },
     csrf: {
       checkOrigin: true

From c0566afd6923e25bbe2e7ff0838d031582466f5c Mon Sep 17 00:00:00 2001
From: DuckySoLucky <robertkovac160@gmail.com>
Date: Tue, 26 Nov 2024 12:09:34 +0100
Subject: [PATCH 2/6] small fixes to rift & dragons

---
 src/lib/sections/stats/Minions.svelte      | 2 +-
 src/lib/sections/stats/Rift.svelte         | 5 +++--
 src/lib/sections/stats/misc/dragons.svelte | 8 +++++++-
 src/lib/server/stats/rift.ts               | 4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/lib/sections/stats/Minions.svelte b/src/lib/sections/stats/Minions.svelte
index 43387e67..4f14a7c1 100644
--- a/src/lib/sections/stats/Minions.svelte
+++ b/src/lib/sections/stats/Minions.svelte
@@ -16,7 +16,7 @@
 
 <Items title="Minions" class="flex-col">
   <div slot="text">
-    <AdditionStat text="Unique Minions" data="{minions.maxedTiers} / {minions.totalTiers}" subData="({((100 * minions.maxedTiers) / minions.totalTiers).toFixed(0)}%)" />
+    <AdditionStat text="Unique Minions" data="{minions.maxedTiers} / {minions.totalTiers}" subData="({((100 * minions.maxedTiers) / minions.totalTiers).toFixed(0)}%)" maxed={minions.maxedTiers === minions.totalTiers} />
     <AdditionStat text="Minion Slots" data={minions.minionsSlots.current} subData="({minions.minionsSlots.next} to next slot)" />
     <AdditionStat text="Bonus Minion Slots" data="{minions.minionsSlots.bonusSlots} / 5" maxed={minions.minionsSlots.bonusSlots === 5} />
     <AdditionStat text="Maxed Minions" data="{minions.maxedMinions} / {minions.totalMinions}" />
diff --git a/src/lib/sections/stats/Rift.svelte b/src/lib/sections/stats/Rift.svelte
index 36d38ea3..9af5e9f0 100644
--- a/src/lib/sections/stats/Rift.svelte
+++ b/src/lib/sections/stats/Rift.svelte
@@ -2,6 +2,7 @@
   import AdditionStat from "$lib/components/AdditionStat.svelte";
   import Chip from "$lib/components/Chip.svelte";
   import Items from "$lib/layouts/stats/Items.svelte";
+  import { format } from "numerable";
   import { cn } from "$lib/shared/utils";
   import type { Stats as StatsType } from "$lib/types/stats";
   import { formatDate, formatDistanceToNowStrict } from "date-fns";
@@ -14,12 +15,12 @@
 
 <Items title="Rift" class="flex-col">
   <div slot="text">
-    <AdditionStat text="Motes" data={rift.motes.purse} asterisk={true}>
+    <AdditionStat text="Motes" data={format(rift.motes.purse)} asterisk={true}>
       <div class="flex flex-col gap-4">
         <div class="text-sm font-bold">
           <span class="text-text/85">Lifetime Motes:</span>
           <span class="text-text">
-            {rift.motes.lifetime}
+            {format(rift.motes.lifetime)}
           </span>
           <span class="block font-normal">Total Motes earned in Rift.</span>
         </div>
diff --git a/src/lib/sections/stats/misc/dragons.svelte b/src/lib/sections/stats/misc/dragons.svelte
index 45a08fa3..4880149e 100644
--- a/src/lib/sections/stats/misc/dragons.svelte
+++ b/src/lib/sections/stats/misc/dragons.svelte
@@ -24,7 +24,13 @@
         {/if}
       {/each}
     </AdditionStat>
-    <!-- TODO: Last Hits -->
+    <AdditionStat text="Last Hits" data={format(misc.dragons.last_hits.total)} asterisk={true}>
+      {#each Object.entries(misc.dragons.last_hits) as [text, data]}
+        {#if text !== "total"}
+          <AdditionStat {text} data={format(data)} />
+        {/if}
+      {/each}
+    </AdditionStat>
     <AdditionStat text="Deats" data={format(misc.dragons.deaths.total)} asterisk={true}>
       {#each Object.entries(misc.dragons.deaths) as [text, data]}
         {#if text !== "total"}
diff --git a/src/lib/server/stats/rift.ts b/src/lib/server/stats/rift.ts
index ba6ec2d9..f0dcc241 100644
--- a/src/lib/server/stats/rift.ts
+++ b/src/lib/server/stats/rift.ts
@@ -42,8 +42,8 @@ function getPorhtals(userProfile: Member) {
 export function getRift(userProfile: Member) {
   return {
     motes: {
-      purse: userProfile.currencies?.motes_purse ?? 0,
-      lifetime: userProfile.player_stats?.rift?.lifetime_motes_earned ?? 0,
+      purse: Math.floor(userProfile.currencies?.motes_purse ?? 0),
+      lifetime: Math.floor(userProfile.player_stats?.rift?.lifetime_motes_earned ?? 0),
       orbs: userProfile.player_stats?.rift?.motes_orb_pickup ?? 0
     },
     enigma: {

From 3a46a8cde0696539238569e4a8d5177a9facb84b Mon Sep 17 00:00:00 2001
From: DuckySoLucky <robertkovac160@gmail.com>
Date: Tue, 26 Nov 2024 12:13:50 +0100
Subject: [PATCH 3/6] revert vscode config

---
 .vscode/settings.json    | 7 ++++---
 src/lib/shared/helper.ts | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 51077165..32821d0d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,7 +2,8 @@
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll": "always"
+    "source.fixAll": "always",
+    "source.organizeImports": "explicit"
   },
   "files.associations": {
     "*.css": "tailwindcss",
@@ -20,7 +21,7 @@
     "typescript": "typescript",
     "svelte": "html"
   },
-  "javascript.updateImportsOnFileMove.enabled": "always",
-  "typescript.updateImportsOnFileMove.enabled": "always",
+  "javascript.updateImportsOnFileMove.enabled": "prompt",
+  "typescript.updateImportsOnFileMove.enabled": "prompt",
   "eslint.validate": ["javascript", "typescript", "svelte"]
 }
diff --git a/src/lib/shared/helper.ts b/src/lib/shared/helper.ts
index b8e771e3..82a41464 100644
--- a/src/lib/shared/helper.ts
+++ b/src/lib/shared/helper.ts
@@ -172,7 +172,7 @@ export function removeFormatting(string: string): string {
 
 /**
  * Returns a new array with unique elements based on the specified key.
- * 
+ *
  * @template T - The type of elements in the array.
  * @param {T[]} arr - The array to filter for unique elements.
  * @param {string} key - The key to determine uniqueness.
@@ -184,4 +184,4 @@ export function uniqBy<T>(arr: T[], key: string) {
     const k = (item as Record<string, unknown>)[key];
     return seen.has(k) ? false : seen.add(k);
   });
-}
\ No newline at end of file
+}

From 9c7de5ef2a8f992bc119a321a84960b55effc8ba Mon Sep 17 00:00:00 2001
From: DuckySoLucky <robertkovac160@gmail.com>
Date: Tue, 26 Nov 2024 12:17:03 +0100
Subject: [PATCH 4/6] maybe fix tests

---
 .../NotEnoughUpdates/parseNEURepository.ts    | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/lib/server/helper/NotEnoughUpdates/parseNEURepository.ts b/src/lib/server/helper/NotEnoughUpdates/parseNEURepository.ts
index 0a4e84e7..64137ca8 100644
--- a/src/lib/server/helper/NotEnoughUpdates/parseNEURepository.ts
+++ b/src/lib/server/helper/NotEnoughUpdates/parseNEURepository.ts
@@ -1,24 +1,33 @@
 import type { NEUItem } from "$types/processed/NotEnoughUpdates/NotEnoughUpdates";
 import fs from "node:fs";
-import { formatBestiaryConstants } from "./parsers/bestiary";
 import { NBTParser } from "./NBTParser";
+import { formatBestiaryConstants } from "./parsers/bestiary";
 
 export const NEU_ITEMS = new Map<string, NEUItem>();
 export const NEU_CONSTANTS = new Map();
 
 export async function parseNEURepository() {
   const timeNow = performance.now();
-  if (!fs.existsSync("src/lib/server/constants/NotEnoughUpdates-REPO/items")) {
-    throw new Error("Couldn't find the NEU items directory (src/lib/server/constants/NotEnoughUpdates-REPO/items). Make sure you have the NEU repository cloned in the correct location.");
+  const itemsPath = "src/lib/server/constants/NotEnoughUpdates-REPO/items";
+
+  if (!fs.existsSync(itemsPath)) {
+    throw new Error(`Couldn't find the NEU items directory (${itemsPath}). Make sure you have the NEU repository cloned in the correct location.`);
   }
 
-  const items = fs.readdirSync("src/lib/server/constants/NotEnoughUpdates-REPO/items");
+  const items = fs.readdirSync(itemsPath);
   for (const item of items) {
-    const itemData = JSON.parse(fs.readFileSync(`src/lib/server/constants/NotEnoughUpdates-REPO/items/${item}`, "utf8"));
-
-    itemData.nbttag = NBTParser.parse(itemData.nbttag);
+    const itemPath = `${itemsPath}/${item}`;
+    if (!fs.statSync(itemPath).isFile()) {
+      continue;
+    }
 
-    NEU_ITEMS.set(itemData.internalname, itemData);
+    try {
+      const itemData = JSON.parse(fs.readFileSync(itemPath, "utf8"));
+      itemData.nbttag = NBTParser.parse(itemData.nbttag);
+      NEU_ITEMS.set(itemData.internalname, itemData);
+    } catch (error) {
+      console.error(`Error processing item ${item}:`, error);
+    }
   }
 
   const constants = fs.readdirSync("src/lib/server/constants/NotEnoughUpdates-REPO/constants");

From 424394311ffab6d074a40a76489cdd1c05878113 Mon Sep 17 00:00:00 2001
From: DuckySoLucky <robertkovac160@gmail.com>
Date: Tue, 26 Nov 2024 12:36:59 +0100
Subject: [PATCH 5/6] test

---
 .github/workflows/website.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
index c75be410..8ae1102f 100644
--- a/.github/workflows/website.yml
+++ b/.github/workflows/website.yml
@@ -97,7 +97,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: NotEnoughUpdates/NotEnoughUpdates-REPO
-          path: src/lib/server/constants/NotEnoughUpdates-REPO/items
+          path: src/lib/server/constants/NotEnoughUpdates-REPO/
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: PNPM Install

From 71f13f717bd1a3a252ae7bfa518311140d882abe Mon Sep 17 00:00:00 2001
From: DuckySoLucky <robertkovac160@gmail.com>
Date: Fri, 6 Dec 2024 18:02:28 +0100
Subject: [PATCH 6/6] bump NEU repo

---
 src/lib/server/constants/NotEnoughUpdates-REPO | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/server/constants/NotEnoughUpdates-REPO b/src/lib/server/constants/NotEnoughUpdates-REPO
index 0130a756..a3a65484 160000
--- a/src/lib/server/constants/NotEnoughUpdates-REPO
+++ b/src/lib/server/constants/NotEnoughUpdates-REPO
@@ -1 +1 @@
-Subproject commit 0130a756513b7163e6b646a79278998f51ba7d81
+Subproject commit a3a65484ae88015b0de76447493522afdb93cc81