remerge sources and machines, since they need to be a cohesive structure. move logic into conductor
start putting together conductor package