Splitting Camera from controls and better entity structure