Refactored entertainment classes into new subpackage