There is only a few files and having so many packages is confusing so move everything to one package
Merge remote-tracking branch 'github/master'