Removed old files, and merged the two constants files