Starting over, proper defines and some sort of real folder structure -sG
Little bit more project/solution clean-up, should be G2G -sG