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

Since the packages were updated the intent in options needed to be updated as well.
Merge branch 'master' into khalil
MODIFIED: the package layout

Re-layouted the packages of the project to properly sub-divide the project.
FIXED: miss spelt settings in the intent.