Rename packages to suit Java name conventions better.
Reorganize packages slightly to better reflect related code.
Renamed and updated Jelly files to reflect the changes to source files.