Added java files and other