Moving UserModule to core