added a admin boolean to users to determine role
removed seperate Admin stuff
removed duplicate files
fixed log conflict