[#BDKCORE-200] - Refactoring namespaces