fixing project architecure