Updating packages and headers to match new convention

Headers have changed and packages convention as well.
This is making sure the rxandroid-framework stays in line with those new conventions.
This is not needed.