diff --git a/.aliases/command-specific/emacsclient b/.aliases/command-specific/emacsclient
new file mode 100644
index 0000000..efb964c
--- /dev/null
+++ b/.aliases/command-specific/emacsclient
@@ -0,0 +1,6 @@
+## Emacs aliases
+alias e="emacsclient"
+alias en="e -n"
+alias et="e -t"
+alias ec="e -c"
+alias ecn="ec -n"
diff --git a/.aliases/command-specific/git b/.aliases/command-specific/git
new file mode 100644
index 0000000..6524dd8
--- /dev/null
+++ b/.aliases/command-specific/git
@@ -0,0 +1,2 @@
+## git
+alias git-yolo='git commit -am "`curl -s http://whatthecommit.com/index.txt`"'
diff --git a/.aliases/command-specific/notify-send b/.aliases/command-specific/notify-send
new file mode 100644
index 0000000..7a1dc9b
--- /dev/null
+++ b/.aliases/command-specific/notify-send
@@ -0,0 +1,2 @@
+## notify-send
+alias N='notify-send "Command finished"'
diff --git a/.aliases/command-specific/pass b/.aliases/command-specific/pass
new file mode 100644
index 0000000..e2e9f3d
--- /dev/null
+++ b/.aliases/command-specific/pass
@@ -0,0 +1,2 @@
+## pass
+alias pc='pass -c'
diff --git a/.aliases/command-specific/rdiff-backup b/.aliases/command-specific/rdiff-backup
new file mode 100644
index 0000000..a073aac
--- /dev/null
+++ b/.aliases/command-specific/rdiff-backup
@@ -0,0 +1,2 @@
+## rdiff-backup
+alias backup="rdiff-backup --exclude-globbing-filelist /home/adam/Documents/backuplist.txt /home/adam/" #target
diff --git a/.aliases/command-specific/todo.sh b/.aliases/command-specific/todo.sh
index 7cf9858..388b43c 100644
--- a/.aliases/command-specific/todo.sh
+++ b/.aliases/command-specific/todo.sh
@@ -1,2 +1,5 @@
 ## todo.sh
 alias taz='todo.sh add "(Z)"'
+alias t='todo.sh'
+alias hw='t hw'
+alias hwr="hw rel"
diff --git a/.aliases/general b/.aliases/general
index b315a4d..201e544 100644
--- a/.aliases/general
+++ b/.aliases/general
@@ -8,23 +8,7 @@ alias la='ll -a'
 alias nmap="noglob nmap"
 
 ## Other Aliases
-alias -g N='notify-send "Command finished"'
 mcd() { mkdir -p "$1" && cd "$1"; }
-alias git-yolo='git commit -am "`curl -s http://whatthecommit.com/index.txt`"'
-alias backup="rdiff-backup --exclude-globbing-filelist /home/adam/Documents/backuplist.txt /home/adam/" #target
-alias pc='pass -c'
-
-## TodoTxt
-alias t='todo.sh'
-alias hw='t hw'
-alias hwr="hw rel"
-
-## Emacs aliases
-alias e="emacsclient"
-alias en="e -n"
-alias et="e -t"
-alias ec="e -c"
-alias ecn="ec -n"
 
 ## Weechat on ag
 alias irc='ssh ag tmux a -t irc'