additional namespace fixes, copyright fixes
bring rubocop down to a resonable level