Move namespaces to constants in appropriate files