Refactored names
Each game will have individual package