fix requires and namespacing