first pass at moving sources to modules