Rewrite js file
Readded costruct into java class
Various FIX and rewrite java class