Moved core user model and units to base

Signed-off-by: Tom Wright <tom@inflatablecookie.com>