Moved activity code to the right package, and deleted spurious src/edu folder.
Renamed activities and xml files to be a little more sane/descriptive.