How to I connect both my app and server to the same subnet?

Is this a combined modem-router with included WIFI or do you have two separate boxes? If it is the first, a combined such, perhaps calling your ISP asking for help to factory reset it. A normal home network should never have to involve different subnets. It might be a misconfiguration or such that makes your router act as a switch only.