[MASTER] Update class packages

- Update existing class package
- Add activity class