Source tree reorganization to improve maintenance