major reorganisation, also new setup