Cleaning up req/res stubs and moving files around