Phase 1 for re-org is to:

1) Create the core bundle
2) Move the low-hanging fruit (easy classes)
3) Adjust tests / imports

Phase 2 will be in a separate jira but will involve migrating classes with harder core/ui mingling.