Refcatoring ArchiV5 for models

Fusion of edit and add forms.