Separated System settings and Study settings into their own classes.