Move forms to separate namespace