Changed group id to knappsack.com and updated package structure to reflect change
Merge remote-tracking branch 'origin/master'