Starting migration to better module shape