Fixed admin vs normal user

Also update file naming system, variables.