Restructed handlers project