MODIFIED: Moved come files into packages
Merge branch 'khalil' of github.com:tinfoilhat/tinfoil-sms into khalil