diff --git a/functions/aliases.fish b/functions/aliases.fish
deleted file mode 100644
index 001ecb0..0000000
--- a/functions/aliases.fish
+++ /dev/null
@@ -1,77 +0,0 @@
-function df --description 'df should always be human readable'
-    command df -h $argv
-end
-
-function ds --description 'calculate size of current or a given dir and sort by size'
-	switch (count $argv)
-
-		case 0
-		    du -hsx * .[a-zA-Z0-9_]* 2> /dev/null | \
-		    egrep '^ *[0-9.]*[MG]' | sort -n > /tmp/list
-		    egrep '^ *[0-9.]*M' /tmp/list
-		    egrep '^ *[0-9.]*G' /tmp/list
-		    rm -rf /tmp/list
-
-		case 1
-		    du -hx $argv .[a-zA-Z0-9_]* 2> /dev/null | \
-		    egrep '^ *[0-9.]*[MG]' | sort -n > /tmp/list
-		    egrep '^ *[0-9.]*M' /tmp/list
-		    egrep '^ *[0-9.]*G' /tmp/list
-		    rm -rf /tmp/list
-
-		case \*
-			echo "Only none or 1 argument is valid!"
-			return 1
-
-	end
-end
-
-function psgrep --description 'show matching processes for $argv'
-	switch (count $argv)
-
-	case 0
-		echo -e "No argument given!\nDo you expect me to guess what you're looking for?"
-		return 1
-
-	case 1
-		ps aux | grep $argv | grep -v grep
-
-	case \*
-		echo "Only 1 argument is valid!"
-		return 1
-
-	end
-end
-
-function nsgrep --description 'show open ports for $argv'
-	switch (count $argv)
-
-	case 0
-		echo -e "No argument given!\nDo you expect me to guess what you're looking for?"
-		return 1
-
-	case 1
-		netstat -tulpen | grep $1 | grep -v grep
-
-	case \*
-		echo "Only 1 argument is valid!"
-		return 1
-
-	end
-end
-
-function randpw --description 'generate a password'
-	switch (count $argv)
-
-	case 0
-		tr -dc 'a-zA-Z0-9_@#%&,;()-' < /dev/urandom | head -c32;echo;
-
-	case 1
-		tr -dc 'a-zA-Z0-9_@#%&,;()-' < /dev/urandom | head -c$argv;echo;
-
-	case \*
-		echo "Only none or 1 argument is valid!"
-		return 1
-
-	end
-end
diff --git a/functions/df.fish b/functions/df.fish
new file mode 100644
index 0000000..7041531
--- /dev/null
+++ b/functions/df.fish
@@ -0,0 +1,3 @@
+function df --description 'df should always be human readable'
+    command df -h $argv
+end
diff --git a/functions/ds.fish b/functions/ds.fish
new file mode 100644
index 0000000..55283e0
--- /dev/null
+++ b/functions/ds.fish
@@ -0,0 +1,23 @@
+function ds --description 'calculate size of current or a given dir and sort by size'
+	switch (count $argv)
+
+		case 0
+		    du -hsx * .[a-zA-Z0-9_]* 2> /dev/null | \
+		    egrep '^ *[0-9.]*[MG]' | sort -n > /tmp/list
+		    egrep '^ *[0-9.]*M' /tmp/list
+		    egrep '^ *[0-9.]*G' /tmp/list
+		    rm -rf /tmp/list
+
+		case 1
+		    du -hx $argv .[a-zA-Z0-9_]* 2> /dev/null | \
+		    egrep '^ *[0-9.]*[MG]' | sort -n > /tmp/list
+		    egrep '^ *[0-9.]*M' /tmp/list
+		    egrep '^ *[0-9.]*G' /tmp/list
+		    rm -rf /tmp/list
+
+		case \*
+			echo "Only none or 1 argument is valid!"
+			return 1
+
+	end
+end
diff --git a/functions/nsgrep.fish b/functions/nsgrep.fish
new file mode 100644
index 0000000..9beeba0
--- /dev/null
+++ b/functions/nsgrep.fish
@@ -0,0 +1,16 @@
+function nsgrep --description 'show open ports for $argv'
+	switch (count $argv)
+
+	case 0
+		echo -e "No argument given!\nDo you expect me to guess what you're looking for?"
+		return 1
+
+	case 1
+		netstat -tulpen | grep $1 | grep -v grep
+
+	case \*
+		echo "Only 1 argument is valid!"
+		return 1
+
+	end
+end
diff --git a/functions/psgrep.fish b/functions/psgrep.fish
new file mode 100644
index 0000000..ce19da2
--- /dev/null
+++ b/functions/psgrep.fish
@@ -0,0 +1,16 @@
+function psgrep --description 'show matching processes for $argv'
+	switch (count $argv)
+
+	case 0
+		echo -e "No argument given!\nDo you expect me to guess what you're looking for?"
+		return 1
+
+	case 1
+		ps aux | grep $argv | grep -v grep
+
+	case \*
+		echo "Only 1 argument is valid!"
+		return 1
+
+	end
+end
diff --git a/functions/randpw.fish b/functions/randpw.fish
new file mode 100644
index 0000000..dd75567
--- /dev/null
+++ b/functions/randpw.fish
@@ -0,0 +1,15 @@
+function randpw --description 'generate a password'
+	switch (count $argv)
+
+	case 0
+		tr -dc 'a-zA-Z0-9_@#%&,;()-' < /dev/urandom | head -c32;echo;
+
+	case 1
+		tr -dc 'a-zA-Z0-9_@#%&,;()-' < /dev/urandom | head -c$argv;echo;
+
+	case \*
+		echo "Only none or 1 argument is valid!"
+		return 1
+
+	end
+end