Move constants to their respective file