Import and bootstrap improvements

 - Old legacy bootstrapping removed
 - New-style import does not use symlinks
 - New functionality to clean old-style symlinks
 - New test cases and utility functions