Restructure and format code for the wizards
Restructure and format import functionality
Split author tag
Code formatting
Format code