relocated source files and simplified json mock response