Added validation library
renamed model base file