Updated Source Layout to take advantage of fixes.