splitted some classes and several changes in settings section