[aquamar] reorganize packages