Rename files, prepare to add java implementation into this project