Fix typo
Move cpp files into dir
Add java files
Add java to build