Clean-up source organization