Organize ClientData
Reorganize internal class in a specific namespace
Manage rewatching/rereading