Class & Package

I rename the package so it would not give me an error, also so it would
match.