Refactor entity types and data structure importing

[pookmish]

READY FOR REVIEW/NOT READY

• (Edit the above to reflect status)

Summary

• TL;DR - what's this PR for?

Review By (Date)

• When does this need to be reviewed by?

Urgency

• How critical is this PR?

Steps to Test

1. Do this
2. Then this
3. Then this

Affected Projects or Products

• Does this PR impact any particular projects, products, or modules?

Associated Issues and/or People

• JIRA ticket
• Other PRs
• Any other contextual information that might be helpful (e.g., description of a bug that this PR fixes, new functionality that it adds, etc.)
• Anyone who should be notified? (@mention them here)

See Also

• PR Checklist