Changed variable name and moved to a new package