How to refactor constants further to both improve both syntax and make project structured better.