Correct sub-module dir structure