Change sub modules to sandnon/lain