reorganize classes by subsystems and utilities