moved user entity to af module