Revise directory structure, Makefile, Info.plist