Package and import organization