Probable serial data fix
Remade buildxml and rearranged directories