directory and namespace structure change