More project layout and import fixes