Further updates to imports to respect project convention re. separation