Reordering the constant and helper files