Netapp library restructured and Rubocop fix