Reordered imports according to guidelines