Move Expression and Environment into external files