Re-organising cross module imports