Revert "Rename cookbooks properly"

This reverts commit f1483204353ee88ab9e21381a9be8e42f665bf65.
Rename files/contents properly