more header cleanup
renaming constants files
defining a ton of constants