moving env variables place
creating domain specific classes
updating tests to use the new domain classes