Trying again to clean up the source tree