More robust package organization