more file structure fixes and import fixes