corrections of package declarations and import statements due to recent
moves