Move settings sub-classes into settings