Trim code
Handle "Finish" button correctly for import wizards
had to rename the packages to make them compliant with buckminster