[Jeev/Module] Combine imports