move commands, fix modules