Unset CDPATH in setup script
Big refactor; start putting stuff into commands