reorganized/replaced modules. Setup JSON responses