new namespace structure
renamed directories