Reorganize files, no functional change
Use new visual style for wizard