rethink/refactor import entries
refactor import