adding Apache v3 license header
reorganized package
Merge remote-tracking branch 'origin/master'