Restructure, remove cookbook submodules to move them