Fixed the ordering of imports