Fixed some more glaring issues with the build and the change of file locations.