Small fixes to importing and namespacing...