[PATCH 1/4] Rewrite the sources module