diff --git a/howtos/gitea/Build.md b/container/gitea/Build.md
similarity index 100%
rename from howtos/gitea/Build.md
rename to container/gitea/Build.md
diff --git a/howtos/nextcloud/Build.md b/container/nextcloud/Build.md
similarity index 100%
rename from howtos/nextcloud/Build.md
rename to container/nextcloud/Build.md
diff --git a/howtos/samba/Build.md b/container/samba/Build.md
similarity index 100%
rename from howtos/samba/Build.md
rename to container/samba/Build.md
diff --git a/howtos/bash/find-and-delete-files-by-extension.md b/linux/bash/find-and-delete-files-by-extension.md
similarity index 100%
rename from howtos/bash/find-and-delete-files-by-extension.md
rename to linux/bash/find-and-delete-files-by-extension.md
diff --git a/howtos/bash/find-file-by-contents.txt b/linux/bash/find-file-by-contents.txt
similarity index 100%
rename from howtos/bash/find-file-by-contents.txt
rename to linux/bash/find-file-by-contents.txt
diff --git a/howtos/bash/reroute-stderr.txt b/linux/bash/reroute-stderr.txt
similarity index 100%
rename from howtos/bash/reroute-stderr.txt
rename to linux/bash/reroute-stderr.txt
diff --git a/howtos/haproxy/certbot.md b/linux/haproxy/certbot.md
similarity index 100%
rename from howtos/haproxy/certbot.md
rename to linux/haproxy/certbot.md
diff --git a/howtos/router/custom-interface-names.md b/linux/router/custom-interface-names.md
similarity index 100%
rename from howtos/router/custom-interface-names.md
rename to linux/router/custom-interface-names.md
diff --git a/howtos/router/dnsmasq.md b/linux/router/dnsmasq.md
similarity index 100%
rename from howtos/router/dnsmasq.md
rename to linux/router/dnsmasq.md
diff --git a/howtos/router/ez-ipupdate.md b/linux/router/ez-ipupdate.md
similarity index 100%
rename from howtos/router/ez-ipupdate.md
rename to linux/router/ez-ipupdate.md
diff --git a/howtos/router/nftables.md b/linux/router/nftables.md
similarity index 100%
rename from howtos/router/nftables.md
rename to linux/router/nftables.md
diff --git a/howtos/linux/add-ubuntu-ppa-debian.md b/linux/system/add-ubuntu-ppa-debian.md
similarity index 100%
rename from howtos/linux/add-ubuntu-ppa-debian.md
rename to linux/system/add-ubuntu-ppa-debian.md
diff --git a/howtos/linux/change-hostname.txt b/linux/system/change-hostname.txt
similarity index 100%
rename from howtos/linux/change-hostname.txt
rename to linux/system/change-hostname.txt
diff --git a/howtos/linux/dhcp-client-setip.md b/linux/system/dhcp-client-setip.md
similarity index 100%
rename from howtos/linux/dhcp-client-setip.md
rename to linux/system/dhcp-client-setip.md
diff --git a/howtos/linux/disable-sleep.md b/linux/system/disable-sleep.md
similarity index 100%
rename from howtos/linux/disable-sleep.md
rename to linux/system/disable-sleep.md
diff --git a/howtos/linux/find-pkg-that-owns-file.txt b/linux/system/find-pkg-that-owns-file.txt
similarity index 100%
rename from howtos/linux/find-pkg-that-owns-file.txt
rename to linux/system/find-pkg-that-owns-file.txt
diff --git a/howtos/linux/kill-gui.txt b/linux/system/kill-gui.txt
similarity index 100%
rename from howtos/linux/kill-gui.txt
rename to linux/system/kill-gui.txt
diff --git a/howtos/linux/rename-user.txt b/linux/system/rename-user.txt
similarity index 100%
rename from howtos/linux/rename-user.txt
rename to linux/system/rename-user.txt
diff --git a/howtos/linux/set-timezone.md b/linux/system/set-timezone.md
similarity index 100%
rename from howtos/linux/set-timezone.md
rename to linux/system/set-timezone.md
diff --git a/howtos/linux/spoof-mac-address.md b/linux/system/spoof-mac-address.md
similarity index 100%
rename from howtos/linux/spoof-mac-address.md
rename to linux/system/spoof-mac-address.md
diff --git a/notes/centauro/active_problems.txt b/notes/centauro/active_problems.txt
deleted file mode 100644
index 9f89bff..0000000
--- a/notes/centauro/active_problems.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-can't launch X windows as root
-	solution: put script to allow root in /home/mario/bin
-
-microphone doesn't work with headphones plugged in
-	solution: overrid headphone mic using hdajackretask
-
-bluetooth always on at boot
-	solution: set RESTORE_DEVICE_STATE_ON_STARTUP option to 1 in /etc/default/tlp
-
-firefox with touchscreen
-	in about:config in firefox, set dom.w3c_touch_events.enabled variable to 1 (default is 2)
-	in /etc/security/pam_env.conf, add line MOZ_USE_XINPUT2 DEFAULT=1
-
-TLP set battery charge limits
-
-check hdmi sound
-
-can't manually rotate screen
-
-find notes app for touchscreen
-
-touchpad stops working after fold
-
-unonfirmed for new install:
--------------------------------------------------------
-rotating screen logs out
-
-wifi doesn't work on boot sometimes
diff --git a/notes/centauro/customizations.txt b/notes/centauro/customizations.txt
deleted file mode 100644
index c60e024..0000000
--- a/notes/centauro/customizations.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-flatpak install discord, skype, xournalpp
-
-add swapfile to home partition
-
-figure out how to stream desktop
diff --git a/notes/centauro/emacs.md b/notes/centauro/emacs.md
deleted file mode 100644
index a92ffbe..0000000
--- a/notes/centauro/emacs.md
+++ /dev/null
@@ -1,6 +0,0 @@
-extra modes:
-- markdown
-- yaml
-
-theme:
-- colorblind theme
\ No newline at end of file
diff --git a/notes/centauro/gnome.md b/notes/centauro/gnome.md
deleted file mode 100644
index a64ef45..0000000
--- a/notes/centauro/gnome.md
+++ /dev/null
@@ -1,17 +0,0 @@
-Extensions:
-- [AlternateTab](https://extensions.gnome.org/extension/15/alternatetab/)
-- [Screenshot Tool](https://extensions.gnome.org/extension/1112/screenshot-tool/)
-- [Caffeine](https://extensions.gnome.org/extension/517/caffeine/)
-- [Window List](https://extensions.gnome.org/extension/602/window-list/)
-- [Places Status Indicator](https://extensions.gnome.org/extension/8/places-status-indicator/)
-- [Put Windows](https://extensions.gnome.org/extension/39/put-windows/)
-- [OpenWeather](https://extensions.gnome.org/extension/750/openweather//)
-- [Launch new instance](https://extensions.gnome.org/extension/600/launch-new-instance/)
-- [KStatusNotifierItem/AppIndicator Support](https://extensions.gnome.org/extension/615/appindicator-support/)
-- [Status Area Horizontal Spacing](https://extensions.gnome.org/extension/355/status-area-horizontal-spacing/)
-- [Desktop Icons NG (DING)](https://extensions.gnome.org/extension/2087/desktop-icons-ng-ding/)
-
-Theme: Adapta-Eta
-Icons: Papirus
-Cursor: [Breeze-Adapta](https://github.com/mustafaozhan/Breeze-Adapta-Cursor)
-	Set Cursor to 22 pixels
diff --git a/notes/centauro/installed_packages.txt b/notes/centauro/installed_packages.txt
deleted file mode 100644
index 8fd49f0..0000000
--- a/notes/centauro/installed_packages.txt
+++ /dev/null
@@ -1 +0,0 @@
-alsa-tools-gui biber caribou cdtool cdparanoia cups discord emacs eyed3 firefox gimp git gnome-shell-extensions gnome-tweaks gnuplot gparted gvfs-backends gvfs-fuse gzip id3 jabref jmtpfs jupyter lame libdvdcss2 localepurge mtp-tools net-tools pavucontrol pdftk pithos pwgen python-gnuplot python3-fuzzywuzzy python3-numpy python3-pandas rename reportbug rsync skypeforlinux smartmontools task-laptop texlive texlive-publishers texlive-science thunderbird tlp tlp-rdw vim vlc wget xsane zoom
diff --git a/notes/centauro/serial_number.txt b/notes/centauro/serial_number.txt
deleted file mode 100644
index 84d475c..0000000
--- a/notes/centauro/serial_number.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Serial Number: MP1CZJ24
-Machine Type: 20LHCTO1WW
\ No newline at end of file
diff --git a/notes/dns/alemor.md b/notes/dns/alemor.md
deleted file mode 100644
index 3e6b484..0000000
--- a/notes/dns/alemor.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# alemor DNS provider
-
-dns service is by [dny.com](account.dyn.com)
-
-record types:
-- MX is mail record
-- CNAME is an alias
-- A is an IP
-- A (WebHop) is url redirect
diff --git a/notes/medusa/file_server.txt b/notes/medusa/file_server.txt
deleted file mode 100644
index ff1b644..0000000
--- a/notes/medusa/file_server.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-functionality needed:
-- contacts & calendar
-  - Radicale
-  - sabre/dav
-- notes
-  - need webdav server for syncing
-  - alternatively, write to file and sync with syncthing
-- file syncing
-  - syncthing
-  - for saved games, use symlinks?
-- network drive mount
-  - webdav
-    - apache
-    - people say webdav is bad
-  - nfs
-    - windows 10 enterprise can mount nfs
-    - v4 can use user-based auth
-    - if nfs, then need solution for outside of lan
-      - bring back vpn?
-  - samba?
-- web file manager
-  - droppy
-  - filebrowser
-- vpn?
-  - server to route vpn requests through
-- password manager
-  - passbolt
-  - keepass + syncthing
-  - bitwarden
-
-final list:
-- sabre/radicale
-- syncthing
-- nfs/samba
-- droppy
diff --git a/notes/medusa/setup.md b/notes/medusa/setup.md
deleted file mode 100644
index 82e690d..0000000
--- a/notes/medusa/setup.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# steps to set up file server
-
-## users
-
-- mar, fernando, juana, daniel
-
-- hogar with UID 2000 for files
-
-- media user with UID 3000 for watching media
-
-- lxdfiles user with UID 60000
-
-## zfs
-
-- mounted zfs vol at `/tank`
-- set up daily snapshots
-- set up bind mounts in /srv/files and /srv/media
-
-## LXD
-
-- installed LXD and set up containers
-- put stuff in `/srv/lxd`
-  - `image` links to `/tank/lxd/image`
-  - `mount` links to `/tank/lxd/mount`
-  
-## tweaks
-
-- tweaked nanorc
-- tweaked haproxy conf
-- tweaked root bashrc
-- uninstalled unattended-upgrades
diff --git a/notes/phone/phone_reinstall.txt b/notes/phone/phone_reinstall.txt
deleted file mode 100644
index 3bfc95e..0000000
--- a/notes/phone/phone_reinstall.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-clear out all downloads, etc from phone
-
-install oneplus camera apk
diff --git a/notes/sirena/setup.md b/notes/sirena/setup.md
deleted file mode 100644
index 78daa56..0000000
--- a/notes/sirena/setup.md
+++ /dev/null
@@ -1,17 +0,0 @@
-compu name sirena
-
-turn off auto login
-
-make start fullscreen
-
-pin home to quick access
-
-change what power button do
-
-fix steam links
-
-install drivers
-  - ryzen master, aorus engine, geforce xp, cpu-z
-  - gpu run scan
-
-apps: 7zip, putty+winscp, git bash?, discord, parsec, libreoffice, virtualbox, vlc
diff --git a/howtos/archer_c7_v2/setup.md b/other/archer_c7_v2/setup.md
similarity index 100%
rename from howtos/archer_c7_v2/setup.md
rename to other/archer_c7_v2/setup.md
diff --git a/howtos/windows/make-symlink.md b/windows/system/make-symlink.md
similarity index 100%
rename from howtos/windows/make-symlink.md
rename to windows/system/make-symlink.md