Refactored packages names to match Android Training section.