Organisation and Fix Branch of Grouper kernel