Completed rearrangment of bash setup