Change code generation layout
Rename import to py_import

Hopefully this will not raise issues.