MakeFile & Structure Update