Fixes and tweaks
Added option to delete empty directories when importing