Refactor for engine namespacing
Fix namespace related issues with draper