Intermediate checkin. DO NOT CHECK OUT THIS COMMIT. Just to partly make changes only file names are changed in this commit. In the next the scripts will be modified so that the module names are updated.