Move module code to module/
Make an actual plugin
Merge