Cleanup the sample.
Cleanup the MainActivity
Move the package
Rename some more stuff