master - Restructure commands.