Fixed some directory errors, need to fix model generator