Fix directory structure.
Update to 1.5.2.
Have plugin.yml get populated by maven.