Shane: renamed packages (removed references to gae).