Reorg bashrc, fix setup`