diff --git a/.xonshrc b/.xonshrc
index f3470b3..fcbb16b 100644
--- a/.xonshrc
+++ b/.xonshrc
@@ -8,9 +8,9 @@ elif $HOSTNAME == "riley-desktop":
 $XONSH_COLOR_STYLE = 'default'
 xontrib load argcomplete autovox jedi z bashisms
 
-source "functions.xsh"
-source "exceptions.xsh"
-source "aliases.xsh"
+source "~/xsh/functions.xsh"
+source "~/xsh/exceptions.xsh"
+source "~/xsh/aliases.xsh"
 
 # TODO: Fix with Arch-based distros
 # import addins # my extra stuffs :p
diff --git a/wallpapers/airshipper-linux.tar.gz b/Pictures/wallpapers/airshipper-linux.tar.gz
similarity index 100%
rename from wallpapers/airshipper-linux.tar.gz
rename to Pictures/wallpapers/airshipper-linux.tar.gz
diff --git a/wallpapers/awesome.png b/Pictures/wallpapers/awesome.png
similarity index 100%
rename from wallpapers/awesome.png
rename to Pictures/wallpapers/awesome.png
diff --git a/wallpapers/broken_car.png b/Pictures/wallpapers/broken_car.png
similarity index 100%
rename from wallpapers/broken_car.png
rename to Pictures/wallpapers/broken_car.png
diff --git a/wallpapers/desert_towers.png b/Pictures/wallpapers/desert_towers.png
similarity index 100%
rename from wallpapers/desert_towers.png
rename to Pictures/wallpapers/desert_towers.png
diff --git a/wallpapers/it_cant_rain_all_the_time.jpeg b/Pictures/wallpapers/it_cant_rain_all_the_time.jpeg
similarity index 100%
rename from wallpapers/it_cant_rain_all_the_time.jpeg
rename to Pictures/wallpapers/it_cant_rain_all_the_time.jpeg
diff --git a/wallpapers/lets-sail.jpg b/Pictures/wallpapers/lets-sail.jpg
similarity index 100%
rename from wallpapers/lets-sail.jpg
rename to Pictures/wallpapers/lets-sail.jpg
diff --git a/wallpapers/lets_sail_3840.png b/Pictures/wallpapers/lets_sail_3840.png
similarity index 100%
rename from wallpapers/lets_sail_3840.png
rename to Pictures/wallpapers/lets_sail_3840.png
diff --git a/wallpapers/minimal_moon.png b/Pictures/wallpapers/minimal_moon.png
similarity index 100%
rename from wallpapers/minimal_moon.png
rename to Pictures/wallpapers/minimal_moon.png
diff --git a/wallpapers/mushroom_glow_light.jpg b/Pictures/wallpapers/mushroom_glow_light.jpg
similarity index 100%
rename from wallpapers/mushroom_glow_light.jpg
rename to Pictures/wallpapers/mushroom_glow_light.jpg
diff --git a/wallpapers/portal.png b/Pictures/wallpapers/portal.png
similarity index 100%
rename from wallpapers/portal.png
rename to Pictures/wallpapers/portal.png
diff --git a/wallpapers/racoon and fox over marshmallows.png b/Pictures/wallpapers/racoon and fox over marshmallows.png
similarity index 100%
rename from wallpapers/racoon and fox over marshmallows.png
rename to Pictures/wallpapers/racoon and fox over marshmallows.png
diff --git a/wallpapers/space_unfolding.png b/Pictures/wallpapers/space_unfolding.png
similarity index 100%
rename from wallpapers/space_unfolding.png
rename to Pictures/wallpapers/space_unfolding.png
diff --git a/wallpapers/watchmakers_house.jpg b/Pictures/wallpapers/watchmakers_house.jpg
similarity index 100%
rename from wallpapers/watchmakers_house.jpg
rename to Pictures/wallpapers/watchmakers_house.jpg
diff --git a/addins/__init__.py b/addins/__init__.py
deleted file mode 100644
index 0f45789..0000000
--- a/addins/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from .version import Version
-from .package import Package
-
-__all__ = ['Version', 'Package']
diff --git a/ps1.xsh b/xontrib/ps1.xsh
similarity index 100%
rename from ps1.xsh
rename to xontrib/ps1.xsh
diff --git a/aliases.xsh b/xsh/aliases.xsh
similarity index 99%
rename from aliases.xsh
rename to xsh/aliases.xsh
index 314e867..67710c6 100644
--- a/aliases.xsh
+++ b/xsh/aliases.xsh
@@ -1,4 +1,4 @@
-source "functions.xsh"
+source xsh/functions.xsh
 
 def _debug():
 	if $XONSH_SHOW_TRACEBACK:
diff --git a/exceptions.xsh b/xsh/exceptions.xsh
similarity index 100%
rename from exceptions.xsh
rename to xsh/exceptions.xsh
diff --git a/functions.xsh b/xsh/functions.xsh
similarity index 97%
rename from functions.xsh
rename to xsh/functions.xsh
index 41c9a89..6439386 100644
--- a/functions.xsh
+++ b/xsh/functions.xsh
@@ -1,4 +1,4 @@
-source "exceptions.xsh"
+source xsh/exceptions.xsh
 
 def in_wsl() -> bool:
 	"""Determines if the system is running inside a WSL environment."""