Chaning the name of the Constant class to encompass more uses. Probably branch to its own files
Adding include guard
Removing the Variable class from the source files.