Refactor of directory and tests, adding flat response flow (no interaction)