Namespace changes and working on Catapult