Reorganisation of AVPF
Adaptations for new version of avpf