Moved modules into contrib folder and removed duplicate migrate modules