Moving around content

After some thinking about the default engine
I have decided to decouple content and
constructs that the engine might serve as a
good example of how the two things work.

I also found a bug. See issues.