added import/export, changed folder structure