MDL-31989 Moving forms to autoload structure