Basic user model implemented
Implemented basic user separation
Renaming some files