Adding fixes for moved files into the plugins