improved structure. made grunt server and grunt test consistent w urls