New namespaces and struvture

NOT tested