restructured project and class roles