Moved commands into own folder