Better command layout

Better way to install commands, and less redundant code.