Refactored the namespace as per request of Hacked.io team