RIP, Actvities.
Moved the things into new packages