Move environments to separate files