Changed dirs to have src and test in java/

* src files were by mistake added to the root tree and not to java/ dir