Moved user controller into core