Rename (refactor) some files related to permissions