some cleanup and renaming the import service