Cleaned up the make files and setup to go to a common directory
One more change to the make files