Moved common classes to rocket-java + refactoring