Re structured project