Move and rename some commands in relevant folders