improved package and class regexpr, and added a little fixer for the public keyword