Split Mech and Env into separate classes