Update module directory structure for 7.2.0