Reorganize import methods