Convert to a single cookbook

* move files
* update Berksfile
Update cookbooks