Helm switch project

Hi Bozhidar Batsov:

Another 3 commits, please read the commit messages and the diff for details.