Update import order to comply with standard

Don't merge this right away