Would be better to put the forms in a dedicated package