created a single namespace for the engine + cleanup