Fixed importing of modules

Still some fixing to do.