Changed structure to sub-command (like linus has implemented git :)