clean up rubocop warnings
wip
rename some files that were missed