refactored serenity constants class. re-organized values into nested classes.