Rebased repo in rpg directory