refactored builder packeges in test, atom, csv, html