removed excess classes added user and file servant classes.