#75 cleanup package structure of plugins