fixed namespacing and requires