Organize imports

Signed-off-by: Fred Bricon <fbricon@gmail.com>