Fixed package name to match folder structure

As package declaration was different than folder structure, source lookup does not work in IDEs like Eclipse.
Merge pull request #278 from lorentzg/master

Fixed package name to match folder structure