Changes file locations locally, commiting in case it helps other Visual Studios users. Number subclasses now include reference to the Number header.