Fix internal include and use paths

The include and use paths for some of these modules are still made for the
previous MCAD file structure.