Merge pull request #2 from flungo/master

Maven Cleanup
Fixing required files

Added back the interfaces
Remove dependency
Merge upstream/master
Re-added dependency