Added Form object to structure data and package files