[#185] rework to a v2/ structure
4 files changed