add classes and enums to java.import resulting object
Merge branch 'master' into nested-enum-value