Change back to the original package and class names: changing those
too at this time is too much effort for testing etc. We can do this
later
Update source and target versions to 1.7