Radar refactoring
Add JAR
merge