Refactor import command

Same way as export command now works with just the one import command
that takes the type to import.