Minor grouping for extensions/refactoring, trying to make the crowded and messy classes disappear