Split commands into individual files
Tweak usage