Move activities to their own package
Got to go