Re-organize .bashrc