move original analysis into new hierarchy (not yet functional)
port over incident form validation
remove obsolete code