Cleanup and segment cookbook files out