Fixed imports and namespacing