more package organisation