reorganisation of pluging architecture