Fixed saving issue, moved wizard files to new directory