Like it says in the title, please get a lot of advice and feedback from people who know RTS games and mechanics when you do this rework. CV game-play is essentially RTS, so please do everything you can to make it a good RTS experience that is fun for the players and can compliment the rest of the team in a balanced way, even if that means putting aside a bit of developer pride.