Namespace Migration

Mataching folder structure to nomenclature