Moved client specific code to environment folder