Putting Simple back in place

* Adjusted the Namespace as well