*.java
refactoring and json schema stuff
#316
deleted extra file
merge