Move constants to separate files...