Code refactor

- Moved packages around to avoid plugin clashing
- Renamed the plugin ID to avoid a clash