Seperate into different namespaces