[arch-dev-public] [PATCH 3/4] Added source-cleanup directory support