Cleanup of packages mockup and switch to using normal imports, no need for exec