[#299] Refactor import ordering