Reorganize CDPATH
Clean up bashrc