diff --git a/dot_aliases b/dot_aliases
index 7d5d114..52e9772 100644
--- a/dot_aliases
+++ b/dot_aliases
@@ -20,8 +20,7 @@ alias rm='rm -i'
 # Directories
 alias dotfiles="cd $DOTFILES"
 alias library="cd $HOME/Library"
-alias projects="cd $PROJECTS"
-alias cupcake="cd $PROJECTS/@cupcake"
+alias cupcake="cd $PROJECTS/@me/@cupcake"
 
 # JS
 alias nfresh="rm -rf node_modules/ package-lock.json && npm install"
diff --git a/dot_company b/dot_company
deleted file mode 100644
index 81db8af..0000000
--- a/dot_company
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env zsh
-
-export SLACK_SYNC_DEV_AUTO_ATTACH=1
-export SSH_USER=mina
-
-# PDE SETUP || 2022-02-11T02:04:21-0800
-##############################################
-/usr/bin/ssh-add -A >/dev/null 2>&1
-##############################################
-
-alias webapp="cd ~/@Projects/@tinyspeck/webapp"
-alias tsimages="./node_modules/.bin/imagemin-slack"
-alias addkey="ssh-add ~/.ssh/id_rsa && ssh-add -l"
-alias attach="slack checkpoint --attach"
-alias detach="slack checkpoint --detach"
-alias remote="slack remote-dev"
-alias buildy="slack run buildy:watch:gantry-v2"
-alias docs="npm run docusaurus start"
-alias static="slack run static-build"
-alias clogs='./thrift_idl/regenerate.sh'
-alias slackpress="cd ~/@Projects/@tinyspeck/webapp/slackpress/wordpress/wp-content/"
-alias buildycold="NO_NPM_INSTALL=1 slack run buildy:watch:gantry-v2 --no-hot"
-alias ffshhvm='killall hhvm && hh_client restart && hh_client'
-
-## sql tunnel
-alias tdev='tunnel dev'
-alias tprod='tunnel prod'
-
-function tunnel() {
-	echo "DB Tunnel [$1]"
-	cli_host=$(slack ssh-cli --print --$1)
-	vthost=$(ssh $cli_host consul catalog nodes -service=vitess-vtgate -datacenter=$1-us-east-1-vitess1 | grep vtgate-cli-$1 | shuf -n 1 | awk '{print $1}')
-	slack mysql-tunnel $vthost
-}
-
-function sync() { slack remote-dev -b $1 }
-
-function remotessh() { slack ssh-dev --env=dev$1 }
-
-function genapi() { hhvm cli/schemas/generate.php -m $1 }
-
-function jest() { npm run jest $1 }
-
-function compress { $HOME/node_modules/.bin/imagemin-slack $1 }
\ No newline at end of file
diff --git a/dot_zshrc b/dot_zshrc
index 6eeaddf..bb38c3c 100644
--- a/dot_zshrc
+++ b/dot_zshrc
@@ -2,7 +2,7 @@
 
 clear
 
-export EDITOR=code
+export EDITOR=nano
 export VISUAL=$EDITOR
 export DROPBOX=$HOME/Dropbox
 export DOTFILES=$HOME/.dotfiles
@@ -39,10 +39,20 @@ if [[ ! -f ~/.zpm/zpm.zsh ]]; then
   git clone --recursive https://github.com/zpm-zsh/zpm ~/.zpm
 fi
 
-if [[ ! -f ~/.company ]]; then
-  touch ~/.company
+if [[ ! -f ~/.extra ]]; then
+  touch ~/.extra
 fi
 
+###############################################################################
+# Load the shell dotfiles, and then some:
+###############################################################################
+source $HOME/.zpm/zpm.zsh
+source $ZSH_DIR/yonce/yonce.zsh
+source $HOME/.path
+source $HOME/.aliases
+source $HOME/.functions
+source $HOME/.extra
+
 ###############################################################################
 # PLUGINS && SUCH
 ###############################################################################
@@ -53,16 +63,6 @@ export NVM_DIR="$HOME/.nvm"
 
 zpm load zpm-zsh/ls
 
-###############################################################################
-# Load the shell dotfiles, and then some:
-###############################################################################
-source $HOME/.zpm/zpm.zsh
-source $ZSH_DIR/yonce/yonce.zsh
-source $HOME/.path
-source $HOME/.aliases
-source $HOME/.functions
-source $HOME/.company
-
 ###############################################################################
 # AUTOMATICALLY ADDED / TO BE SORTED
 ###############################################################################