Added new activities and moved some xmls around.