Use the new thelonious directory and namespace structure.