ref #1226 [renamed files]
ref #1226 [Design v2 early implementation]