[PATCH 3/3] Updated Makefile to backout directory breakouts