Removed *.java and *.xml from gitignore

and updated file names finally