cleanup

Some makefiles were targeting a few wrong locations for object files