Re-Structure es.cfc