Moved constants that I could for the time being but lots of them are used in multiple files or are there for consumers of the client.