Organize imports + configure m2e lifecycle-mapping

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