remove Main.java for unused
make more usefull package for source
clean code +update ADD test