#13 putting generated java classes and refactoring related classes