Reorganisation + doc js