Update for dir changes. Format->Makefile
move readme todos into makefile for now