Reorganisation and first algo commit