reorganized a bit the dependencies