Fixed import issues

Got nested imports working properly and amended some calls in the
script for it.