Isolated each shell's source hijacking working dirs
Renames and code clean up in bpm.sh