Renamed some packages to make more sense.

Moved the .jsp files out of public view.