Add prototype design
Move to v2 structure