Changed module dir structure