Organized commands and fixed #include statements.