partial structure cleanup
alignment
testing cms as json content api