Tweak namespaces; start fixtures.
Decided that I don't like underscores prefixing variable names after all.