Clean up

Moved a couple of directories and made changes to plugin to reflect new
directory structure