Refactored codes

1. Refactored game screens and other objects
2. Added MarketScreen and UpgradesScreen