better module moving management