Removed some files, changed names, and added code for java classes