until http://tickets.opscode.com/browse/CHEF-672 is fixed move these.
Fix namespacing and indentation.