Moved constants out of lib now that better namespacing allows it
Rename file