FR2 after refactoring

XMLGenerator and UploadFiletoServer are now working fine.