CLEANUP

Unused java files and xml layouts are deleted
Some files are renamed