Refactorings classes and group them by sections