Reorganize project files a bit
Update MakeFile