Update legacy files structure/namespaces
Update SetupWizard to match behat 3 definitions