Fix include paths and move stuff around

In Dynamicweb 8.3.0.1, the include paths have been fixed.