Fixed Makefiles. Regenerated coregen files which fixed weird could not find module/primitive build errors.