Re-organize + version tests
Fix broken scale import