Fixed bugs in Soar source file structure