Shortened the names of the counter variables
Moved Surrogate into a separate file