Move form.xml to form/ to prevent dummy discovery
Pending changes