Bug Fix: moved all plugins to proper directory structure