Project's sources partial reworked.