Refactor XForms

All in one assembly - no need for splitting