Reorganized some sections of the .bashrc