Fixing issues with Nick's last commit

Package renamed, import Intent class