Add some content primatives, and move things into a content namespace

Hopefully for better organization, but it's an experiment of sorts.