new import structure, small refactor