Some cleanup in the code
Fix class names
More detailed plugin.xml file, closes #1