diff --git a/src/_afew b/functions/_afew
similarity index 100%
rename from src/_afew
rename to functions/_afew
diff --git a/src/_android b/functions/_android
similarity index 100%
rename from src/_android
rename to functions/_android
diff --git a/src/_archlinux-java b/functions/_archlinux-java
similarity index 100%
rename from src/_archlinux-java
rename to functions/_archlinux-java
diff --git a/src/_artisan b/functions/_artisan
similarity index 100%
rename from src/_artisan
rename to functions/_artisan
diff --git a/src/_atach b/functions/_atach
similarity index 100%
rename from src/_atach
rename to functions/_atach
diff --git a/src/_bitcoin-cli b/functions/_bitcoin-cli
similarity index 100%
rename from src/_bitcoin-cli
rename to functions/_bitcoin-cli
diff --git a/src/_bower b/functions/_bower
similarity index 100%
rename from src/_bower
rename to functions/_bower
diff --git a/src/_bundle b/functions/_bundle
similarity index 100%
rename from src/_bundle
rename to functions/_bundle
diff --git a/src/_caffeinate b/functions/_caffeinate
similarity index 100%
rename from src/_caffeinate
rename to functions/_caffeinate
diff --git a/src/_cap b/functions/_cap
similarity index 100%
rename from src/_cap
rename to functions/_cap
diff --git a/src/_cask b/functions/_cask
similarity index 100%
rename from src/_cask
rename to functions/_cask
diff --git a/src/_ccache b/functions/_ccache
similarity index 100%
rename from src/_ccache
rename to functions/_ccache
diff --git a/src/_cf b/functions/_cf
similarity index 100%
rename from src/_cf
rename to functions/_cf
diff --git a/src/_cheat b/functions/_cheat
similarity index 100%
rename from src/_cheat
rename to functions/_cheat
diff --git a/src/_choc b/functions/_choc
similarity index 100%
rename from src/_choc
rename to functions/_choc
diff --git a/src/_chromium b/functions/_chromium
similarity index 100%
rename from src/_chromium
rename to functions/_chromium
diff --git a/src/_cmake b/functions/_cmake
similarity index 100%
rename from src/_cmake
rename to functions/_cmake
diff --git a/src/_coffee b/functions/_coffee
similarity index 100%
rename from src/_coffee
rename to functions/_coffee
diff --git a/src/_composer b/functions/_composer
similarity index 100%
rename from src/_composer
rename to functions/_composer
diff --git a/src/_conan b/functions/_conan
similarity index 100%
rename from src/_conan
rename to functions/_conan
diff --git a/src/_concourse b/functions/_concourse
similarity index 100%
rename from src/_concourse
rename to functions/_concourse
diff --git a/src/_console b/functions/_console
similarity index 100%
rename from src/_console
rename to functions/_console
diff --git a/src/_dad b/functions/_dad
similarity index 100%
rename from src/_dad
rename to functions/_dad
diff --git a/src/_debuild b/functions/_debuild
similarity index 100%
rename from src/_debuild
rename to functions/_debuild
diff --git a/src/_dget b/functions/_dget
similarity index 100%
rename from src/_dget
rename to functions/_dget
diff --git a/src/_dhcpcd b/functions/_dhcpcd
similarity index 100%
rename from src/_dhcpcd
rename to functions/_dhcpcd
diff --git a/src/_diana b/functions/_diana
similarity index 100%
rename from src/_diana
rename to functions/_diana
diff --git a/src/_docpad b/functions/_docpad
similarity index 100%
rename from src/_docpad
rename to functions/_docpad
diff --git a/src/_drush b/functions/_drush
similarity index 100%
rename from src/_drush
rename to functions/_drush
diff --git a/src/_ecdsautil b/functions/_ecdsautil
similarity index 100%
rename from src/_ecdsautil
rename to functions/_ecdsautil
diff --git a/src/_emulator b/functions/_emulator
similarity index 100%
rename from src/_emulator
rename to functions/_emulator
diff --git a/src/_envdir b/functions/_envdir
similarity index 100%
rename from src/_envdir
rename to functions/_envdir
diff --git a/src/_exportfs b/functions/_exportfs
similarity index 100%
rename from src/_exportfs
rename to functions/_exportfs
diff --git a/src/_fab b/functions/_fab
similarity index 100%
rename from src/_fab
rename to functions/_fab
diff --git a/src/_ffind b/functions/_ffind
similarity index 100%
rename from src/_ffind
rename to functions/_ffind
diff --git a/src/_flameshot b/functions/_flameshot
similarity index 100%
rename from src/_flameshot
rename to functions/_flameshot
diff --git a/src/_fleetctl b/functions/_fleetctl
similarity index 100%
rename from src/_fleetctl
rename to functions/_fleetctl
diff --git a/src/_flutter b/functions/_flutter
similarity index 100%
rename from src/_flutter
rename to functions/_flutter
diff --git a/src/_force b/functions/_force
similarity index 100%
rename from src/_force
rename to functions/_force
diff --git a/src/_fwupdmgr b/functions/_fwupdmgr
similarity index 100%
rename from src/_fwupdmgr
rename to functions/_fwupdmgr
diff --git a/src/_gas b/functions/_gas
similarity index 100%
rename from src/_gas
rename to functions/_gas
diff --git a/src/_ghc b/functions/_ghc
similarity index 100%
rename from src/_ghc
rename to functions/_ghc
diff --git a/src/_gist b/functions/_gist
similarity index 100%
rename from src/_gist
rename to functions/_gist
diff --git a/src/_git-flow b/functions/_git-flow
similarity index 100%
rename from src/_git-flow
rename to functions/_git-flow
diff --git a/src/_git-journal b/functions/_git-journal
similarity index 100%
rename from src/_git-journal
rename to functions/_git-journal
diff --git a/src/_git-pulls b/functions/_git-pulls
similarity index 100%
rename from src/_git-pulls
rename to functions/_git-pulls
diff --git a/src/_git-revise b/functions/_git-revise
similarity index 100%
rename from src/_git-revise
rename to functions/_git-revise
diff --git a/src/_git-wtf b/functions/_git-wtf
similarity index 100%
rename from src/_git-wtf
rename to functions/_git-wtf
diff --git a/src/_glances b/functions/_glances
similarity index 100%
rename from src/_glances
rename to functions/_glances
diff --git a/src/_golang b/functions/_golang
similarity index 100%
rename from src/_golang
rename to functions/_golang
diff --git a/src/_google b/functions/_google
similarity index 100%
rename from src/_google
rename to functions/_google
diff --git a/src/_gtk-launch b/functions/_gtk-launch
similarity index 100%
rename from src/_gtk-launch
rename to functions/_gtk-launch
diff --git a/src/_hledger b/functions/_hledger
similarity index 100%
rename from src/_hledger
rename to functions/_hledger
diff --git a/src/_homestead b/functions/_homestead
similarity index 100%
rename from src/_homestead
rename to functions/_homestead
diff --git a/src/_httpie b/functions/_httpie
similarity index 100%
rename from src/_httpie
rename to functions/_httpie
diff --git a/src/_ibus b/functions/_ibus
similarity index 100%
rename from src/_ibus
rename to functions/_ibus
diff --git a/src/_include-what-you-use b/functions/_include-what-you-use
similarity index 100%
rename from src/_include-what-you-use
rename to functions/_include-what-you-use
diff --git a/src/_inxi b/functions/_inxi
similarity index 100%
rename from src/_inxi
rename to functions/_inxi
diff --git a/src/_jmeter b/functions/_jmeter
similarity index 100%
rename from src/_jmeter
rename to functions/_jmeter
diff --git a/src/_jmeter-plugins b/functions/_jmeter-plugins
similarity index 100%
rename from src/_jmeter-plugins
rename to functions/_jmeter-plugins
diff --git a/src/_jonas b/functions/_jonas
similarity index 100%
rename from src/_jonas
rename to functions/_jonas
diff --git a/src/_jrnl b/functions/_jrnl
similarity index 100%
rename from src/_jrnl
rename to functions/_jrnl
diff --git a/src/_kak b/functions/_kak
similarity index 100%
rename from src/_kak
rename to functions/_kak
diff --git a/src/_kitchen b/functions/_kitchen
similarity index 100%
rename from src/_kitchen
rename to functions/_kitchen
diff --git a/src/_knife b/functions/_knife
similarity index 100%
rename from src/_knife
rename to functions/_knife
diff --git a/src/_language_codes b/functions/_language_codes
similarity index 100%
rename from src/_language_codes
rename to functions/_language_codes
diff --git a/src/_lunchy b/functions/_lunchy
similarity index 100%
rename from src/_lunchy
rename to functions/_lunchy
diff --git a/src/_middleman b/functions/_middleman
similarity index 100%
rename from src/_middleman
rename to functions/_middleman
diff --git a/src/_mina b/functions/_mina
similarity index 100%
rename from src/_mina
rename to functions/_mina
diff --git a/src/_mix b/functions/_mix
similarity index 100%
rename from src/_mix
rename to functions/_mix
diff --git a/src/_mussh b/functions/_mussh
similarity index 100%
rename from src/_mussh
rename to functions/_mussh
diff --git a/src/_mvn b/functions/_mvn
similarity index 100%
rename from src/_mvn
rename to functions/_mvn
diff --git a/src/_nano b/functions/_nano
similarity index 100%
rename from src/_nano
rename to functions/_nano
diff --git a/src/_nftables b/functions/_nftables
similarity index 100%
rename from src/_nftables
rename to functions/_nftables
diff --git a/src/_node b/functions/_node
similarity index 100%
rename from src/_node
rename to functions/_node
diff --git a/src/_nvm b/functions/_nvm
similarity index 100%
rename from src/_nvm
rename to functions/_nvm
diff --git a/src/_openssl b/functions/_openssl
similarity index 100%
rename from src/_openssl
rename to functions/_openssl
diff --git a/src/_optirun b/functions/_optirun
similarity index 100%
rename from src/_optirun
rename to functions/_optirun
diff --git a/src/_patool b/functions/_patool
similarity index 100%
rename from src/_patool
rename to functions/_patool
diff --git a/src/_perf b/functions/_perf
similarity index 100%
rename from src/_perf
rename to functions/_perf
diff --git a/src/_periscope b/functions/_periscope
similarity index 100%
rename from src/_periscope
rename to functions/_periscope
diff --git a/src/_pgsql_utils b/functions/_pgsql_utils
similarity index 100%
rename from src/_pgsql_utils
rename to functions/_pgsql_utils
diff --git a/src/_phing b/functions/_phing
similarity index 100%
rename from src/_phing
rename to functions/_phing
diff --git a/src/_pixz b/functions/_pixz
similarity index 100%
rename from src/_pixz
rename to functions/_pixz
diff --git a/src/_pkcon b/functions/_pkcon
similarity index 100%
rename from src/_pkcon
rename to functions/_pkcon
diff --git a/src/_play b/functions/_play
similarity index 100%
rename from src/_play
rename to functions/_play
diff --git a/src/_pm2 b/functions/_pm2
similarity index 100%
rename from src/_pm2
rename to functions/_pm2
diff --git a/src/_port b/functions/_port
similarity index 100%
rename from src/_port
rename to functions/_port
diff --git a/src/_pygmentize b/functions/_pygmentize
similarity index 100%
rename from src/_pygmentize
rename to functions/_pygmentize
diff --git a/src/_rails b/functions/_rails
similarity index 100%
rename from src/_rails
rename to functions/_rails
diff --git a/src/_ralio b/functions/_ralio
similarity index 100%
rename from src/_ralio
rename to functions/_ralio
diff --git a/src/_redis-cli b/functions/_redis-cli
similarity index 100%
rename from src/_redis-cli
rename to functions/_redis-cli
diff --git a/src/_rfkill b/functions/_rfkill
similarity index 100%
rename from src/_rfkill
rename to functions/_rfkill
diff --git a/src/_rkt b/functions/_rkt
similarity index 100%
rename from src/_rkt
rename to functions/_rkt
diff --git a/src/_rslsync b/functions/_rslsync
similarity index 100%
rename from src/_rslsync
rename to functions/_rslsync
diff --git a/src/_rspec b/functions/_rspec
similarity index 100%
rename from src/_rspec
rename to functions/_rspec
diff --git a/src/_rsvm b/functions/_rsvm
similarity index 100%
rename from src/_rsvm
rename to functions/_rsvm
diff --git a/src/_rubocop b/functions/_rubocop
similarity index 100%
rename from src/_rubocop
rename to functions/_rubocop
diff --git a/src/_sbt b/functions/_sbt
similarity index 100%
rename from src/_sbt
rename to functions/_sbt
diff --git a/src/_scala b/functions/_scala
similarity index 100%
rename from src/_scala
rename to functions/_scala
diff --git a/src/_scrub b/functions/_scrub
similarity index 100%
rename from src/_scrub
rename to functions/_scrub
diff --git a/src/_sdd b/functions/_sdd
similarity index 100%
rename from src/_sdd
rename to functions/_sdd
diff --git a/src/_setcap b/functions/_setcap
similarity index 100%
rename from src/_setcap
rename to functions/_setcap
diff --git a/src/_setup.py b/functions/_setup.py
similarity index 100%
rename from src/_setup.py
rename to functions/_setup.py
diff --git a/src/_sfdx b/functions/_sfdx
similarity index 100%
rename from src/_sfdx
rename to functions/_sfdx
diff --git a/src/_showoff b/functions/_showoff
similarity index 100%
rename from src/_showoff
rename to functions/_showoff
diff --git a/src/_srm b/functions/_srm
similarity index 100%
rename from src/_srm
rename to functions/_srm
diff --git a/src/_stack b/functions/_stack
similarity index 100%
rename from src/_stack
rename to functions/_stack
diff --git a/src/_subl b/functions/_subl
similarity index 100%
rename from src/_subl
rename to functions/_subl
diff --git a/src/_subliminal b/functions/_subliminal
similarity index 100%
rename from src/_subliminal
rename to functions/_subliminal
diff --git a/src/_supervisorctl b/functions/_supervisorctl
similarity index 100%
rename from src/_supervisorctl
rename to functions/_supervisorctl
diff --git a/src/_svm b/functions/_svm
similarity index 100%
rename from src/_svm
rename to functions/_svm
diff --git a/src/_tarsnap b/functions/_tarsnap
similarity index 100%
rename from src/_tarsnap
rename to functions/_tarsnap
diff --git a/src/_teamocil b/functions/_teamocil
similarity index 100%
rename from src/_teamocil
rename to functions/_teamocil
diff --git a/src/_thor b/functions/_thor
similarity index 100%
rename from src/_thor
rename to functions/_thor
diff --git a/src/_tmuxinator b/functions/_tmuxinator
similarity index 100%
rename from src/_tmuxinator
rename to functions/_tmuxinator
diff --git a/src/_tmuxp b/functions/_tmuxp
similarity index 100%
rename from src/_tmuxp
rename to functions/_tmuxp
diff --git a/src/_tox b/functions/_tox
similarity index 100%
rename from src/_tox
rename to functions/_tox
diff --git a/src/_trash-empty b/functions/_trash-empty
similarity index 100%
rename from src/_trash-empty
rename to functions/_trash-empty
diff --git a/src/_trash-list b/functions/_trash-list
similarity index 100%
rename from src/_trash-list
rename to functions/_trash-list
diff --git a/src/_trash-put b/functions/_trash-put
similarity index 100%
rename from src/_trash-put
rename to functions/_trash-put
diff --git a/src/_trash-restore b/functions/_trash-restore
similarity index 100%
rename from src/_trash-restore
rename to functions/_trash-restore
diff --git a/src/_udisksctl b/functions/_udisksctl
similarity index 100%
rename from src/_udisksctl
rename to functions/_udisksctl
diff --git a/src/_ufw b/functions/_ufw
similarity index 100%
rename from src/_ufw
rename to functions/_ufw
diff --git a/src/_vagrant b/functions/_vagrant
similarity index 100%
rename from src/_vagrant
rename to functions/_vagrant
diff --git a/src/_virtualbox b/functions/_virtualbox
similarity index 100%
rename from src/_virtualbox
rename to functions/_virtualbox
diff --git a/src/_vnstat b/functions/_vnstat
similarity index 100%
rename from src/_vnstat
rename to functions/_vnstat
diff --git a/src/_wemux b/functions/_wemux
similarity index 100%
rename from src/_wemux
rename to functions/_wemux
diff --git a/src/_wg-quick b/functions/_wg-quick
similarity index 100%
rename from src/_wg-quick
rename to functions/_wg-quick
diff --git a/src/_xinput b/functions/_xinput
similarity index 100%
rename from src/_xinput
rename to functions/_xinput
diff --git a/src/_xsel b/functions/_xsel
similarity index 100%
rename from src/_xsel
rename to functions/_xsel
diff --git a/src/_yaourt b/functions/_yaourt
similarity index 100%
rename from src/_yaourt
rename to functions/_yaourt
diff --git a/src/_yarn b/functions/_yarn
similarity index 100%
rename from src/_yarn
rename to functions/_yarn
diff --git a/src/_zcash-cli b/functions/_zcash-cli
similarity index 100%
rename from src/_zcash-cli
rename to functions/_zcash-cli
diff --git a/zsh-completions.plugin.zsh b/zsh-completions.plugin.zsh
index b56f55d..63bb5b5 100644
--- a/zsh-completions.plugin.zsh
+++ b/zsh-completions.plugin.zsh
@@ -1 +1,8 @@
-fpath+="${0:h}/src"
+# Standarized $0 handling, following:
+# https://github.com/zdharma/Zsh-100-Commits-Club/blob/master/Zsh-Plugin-Standard.adoc
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
+if [[ $PMSPEC != *f* ]] {
+  fpath+=( "${0:h}/functions" )
+}