Create user content objects

Really simplified user content types, but that should e sufficient for
now. Also refactoring.