CMS-2190 Move api.schema.content.form to form
Some clean-up.