minor refactoring
unpacking plugin in correct dir