Merging latest updates
Reorganizing bashkit