Changed dirs to have src and test in java/

* src files were by mistake added to the root tree and not to java/ dir
Merge pull request #135 from DanielSoos/develop

Final code modified - placed dirs src/ and test/ into java/src, java/test