re-structured project for set3