Unittest structural changes
Gruntfile cleanup
Gruntfile cleanup
Cleanup server file