data-import refactoring done; partial dump update, more to follow