Upgraded to commandant and moved commands into the commands folder accordingly.