[Fixed] Jedi badges

Also moved files still to merge