re-organize imports to meet Qi4j  conventions.