changes to reflect new source layout