Adjust structure a little more and tweak the tests
Update the docs to match the new syntax changes