Reorganise env files