Build script places files in helpful locations now, fixed build errors