adjusted for HTTPS webconfigurator
restructuring
resolved conflect