revert this stuid pointless commit nolinuxnoparty made.

Don't edit things you don't know about.

The package name needs to be equivalent to the name of the classes, be declared in the manifest correctly, and, in some prevalent cases, the layout(s).