removed non-common extensions
adding new modules
brought in new modules from master