Converted import/export to independent classes