move some stuff around

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Merge branch '3.0'

* 3.0:
  move some stuff around