Added java version, updated dir structure