Don't need the core/ directory for now.
Change imports to reflect package reorganization.
Update tests to pass.

zip() returns tuples, so the test comparisons need to use
sequences of tuples to make assertions pass.