Jeff - move activities to their own package; create a blank activity for registration
Jeff - merge conflict