Merge compressed files code from two modules
Import reordering