Rename C files, begin renaming of Java files
Remove empty solution
Finish Java renaming, remove another empty solution