rework namespaces to exclude Core part