updated namespaces according to moving forms to their folder