fixed user model and moved header file