updated structure, reformatted exporting