Reorganisation of picoapp