changed the namespacing to make this easier to work with cross-project