Moving more imports to where thy should be.
revamp
2018-02-05, Edouard Tisserant