clean up/unify build-system
plugin variants..