changed import structure