Rejig package layout to keep command clear of the rest