Reorganised imports and removed old code
Merge remote-tracking branch 'origin/strict_layout' into strict_layout