Move wingspan-forms to top level