Relocated all the element constants and made the constants file look cleaner.