Split parser into separate file, simplified some commands.