replacing HeaderBuilder, SourceBuilder with Header, Source