Moving patched modules into correct locations, adding to patches.rtf
Merge from development branch, fixing patch locaations