Fixes organization of command and params