It works!
Cleaning, renaming and some java docs