Started Directory redesign and clean up of Makefile