Move cookbooks into cookbook directory
Update to new version of cookbooks
Update config to work with chef-solo