Refactored PlayActivity and associated files