Minor tweaks
Folders Rearranged
Makefile improved