Changed name of some files. Added private/password fields to groups