Removed Kiwi (actually this time).  Readded Kiwi as git submodule.  Added Kiwi project back to workspace