Reorganize commands inside commands folder