Rename model_commands -> model_shape_cmds
Split widget commands into separate file
Fix typo in function name