Restructure commands