Refactored server to pull out JSON functionality
Competence issues resolved in makefiles.
Resloved issues folllwing name changes.
Missed some errors in makefile.
Updated accordingly.
Merge fix