Fix/plugin subdir

Fix for #383