name change and event binding fix
name changes, organization in the coffe file