Package organisation

Be sure to set your eclipse view to be “hierarchical”, otherwise this
will look just as big a mess!