Reorganize files and add User class because of a little modification