modifications of imports, namespace, etc... closes #43