src reorganisation