Switch to use import * as for code

This removes the support for the old syntax

Fixes #1119