Renamed plugin and changed code accordingly
Changes to code structure