Change top level imports

This is a replica of #504 due to the dev model switch.