Added bunch of rename and moves
Added rename and find and replace