added explicit version for maven-plugin
Cleaned up a bit, and created a 'jar with dependencies'
refactored a bit