Moved directories again, now compiles and cfg pass python parsing test