Some cleanup, trying to get adjacent text outlets working
Remove the Content namespace

Using the Content module was an experiment. Caused a lot more problem then
worth. Maybe in the future, but for flat so much simpiler and works so well.