restructuring files, added grid column builder