Organized the commands and fixed includes