Fix subscriber request

- organize better the files