Modifications done for java files and xmls