Did some code cleaning and added two files which separate the user base