Modify Directory Structure

Cut down on excessive directory structure for the plugin. Just go one
deep.
Version Bumb