reverted struct file changes, will add later