Reorganize bashrc.d and clean up .bashrc