removing old module files
solving merge conflict