module organisation,
integrate common plugin in core
clean up dirty source
update licene
clean up