Cleaned up configuration classes....a lot.