Initial module merge