Modified all java files and Assets folder